mirror of
https://github.com/Orama-Interactive/Pixelorama.git
synced 2025-01-18 17:19:50 +00:00
Fixed json crash and text issue in EditPalettePopup
Importing a non-palette json file no longer crashes the app. Enabled autowrap for a label in EditPalettePopup because some translated text were pushing the boundaries of the dialog window.
This commit is contained in:
OverloadedOrama
parent
802f423067
commit
83916f8913
|
|
@ -24,6 +24,7 @@ Igor Santarek (jegor377), rob-a-bolton, Kinwailo
|
|||
- Fixed alpha blending and lighting/darkening issues when drawing pixels with mirroring.
|
||||
- Fixed issue where if you moved a frame to the start (move left), it was invisible.
|
||||
- Fixed a rare issue with Undo/Redo not working while motion drawing and making lines.
|
||||
- Importing a non-palette json file no longer crashes the app.
|
||||
<br><br>
|
||||
|
||||
## [v0.7] - 2020-05-16
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -152,7 +152,7 @@ border_color = Color( 0.321569, 0.321569, 0.321569, 1 )
|
|||
expand_margin_top = 2.0
|
||||
expand_margin_bottom = 2.0
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=27]
|
||||
[sub_resource type="StyleBoxFlat" id=17]
|
||||
bg_color = Color( 0.588235, 0.568627, 0.470588, 1 )
|
||||
border_width_left = 4
|
||||
border_width_top = 4
|
||||
|
|
@ -164,7 +164,7 @@ corner_radius_top_right = 4
|
|||
corner_radius_bottom_right = 4
|
||||
corner_radius_bottom_left = 4
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=17]
|
||||
[sub_resource type="StyleBoxFlat" id=18]
|
||||
bg_color = Color( 0.109804, 0.0862745, 0.0862745, 0 )
|
||||
border_width_left = 1
|
||||
border_width_top = 1
|
||||
|
|
@ -177,10 +177,10 @@ corner_radius_bottom_right = 4
|
|||
corner_radius_bottom_left = 4
|
||||
anti_aliasing = false
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=18]
|
||||
[sub_resource type="StyleBoxFlat" id=19]
|
||||
bg_color = Color( 0.854902, 0.74902, 0.494118, 1 )
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=19]
|
||||
[sub_resource type="StyleBoxFlat" id=20]
|
||||
content_margin_left = 4.5
|
||||
content_margin_right = 4.5
|
||||
content_margin_top = 3.0
|
||||
|
|
@ -191,7 +191,7 @@ corner_radius_top_right = 5
|
|||
corner_radius_bottom_right = 5
|
||||
corner_radius_bottom_left = 5
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=20]
|
||||
[sub_resource type="StyleBoxFlat" id=21]
|
||||
bg_color = Color( 0.588235, 0.568627, 0.470588, 1 )
|
||||
border_width_left = 6
|
||||
border_width_top = 10
|
||||
|
|
@ -204,10 +204,10 @@ corner_radius_bottom_right = 4
|
|||
corner_radius_bottom_left = 4
|
||||
anti_aliasing = false
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=21]
|
||||
[sub_resource type="StyleBoxFlat" id=22]
|
||||
bg_color = Color( 0.219608, 0.211765, 0.168627, 1 )
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=22]
|
||||
[sub_resource type="StyleBoxFlat" id=23]
|
||||
bg_color = Color( 1, 0.898039, 0.501961, 1 )
|
||||
border_width_left = 5
|
||||
border_width_top = 10
|
||||
|
|
@ -220,7 +220,7 @@ corner_radius_bottom_right = 4
|
|||
corner_radius_bottom_left = 4
|
||||
anti_aliasing = false
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=23]
|
||||
[sub_resource type="StyleBoxFlat" id=24]
|
||||
bg_color = Color( 0.545098, 0.384314, 0, 1 )
|
||||
border_width_left = 10
|
||||
border_width_top = 6
|
||||
|
|
@ -228,7 +228,7 @@ border_width_right = 10
|
|||
border_width_bottom = 8
|
||||
border_color = Color( 0.545098, 0.384314, 0, 1 )
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=24]
|
||||
[sub_resource type="StyleBoxFlat" id=25]
|
||||
bg_color = Color( 0.145098, 0.145098, 0.164706, 1 )
|
||||
border_width_left = 10
|
||||
border_width_top = 6
|
||||
|
|
@ -236,7 +236,7 @@ border_width_right = 10
|
|||
border_width_bottom = 8
|
||||
border_color = Color( 0.145098, 0.145098, 0.164706, 1 )
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=25]
|
||||
[sub_resource type="StyleBoxFlat" id=26]
|
||||
bg_color = Color( 1, 0.898039, 0.501961, 1 )
|
||||
border_width_left = 10
|
||||
border_width_top = 6
|
||||
|
|
@ -244,7 +244,7 @@ border_width_right = 10
|
|||
border_width_bottom = 8
|
||||
border_color = Color( 1, 0.898039, 0.501961, 1 )
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=26]
|
||||
[sub_resource type="StyleBoxFlat" id=27]
|
||||
bg_color = Color( 0.588235, 0.568627, 0.470588, 1 )
|
||||
border_width_left = 4
|
||||
border_width_top = 4
|
||||
|
|
@ -375,7 +375,7 @@ ItemList/constants/icon_margin = 4
|
|||
ItemList/constants/line_separation = 2
|
||||
ItemList/constants/vseparation = 4
|
||||
ItemList/fonts/font = null
|
||||
ItemList/styles/bg = SubResource( 27 )
|
||||
ItemList/styles/bg = SubResource( 17 )
|
||||
ItemList/styles/bg_focus = null
|
||||
ItemList/styles/cursor = null
|
||||
ItemList/styles/cursor_unfocused = null
|
||||
|
|
@ -401,7 +401,7 @@ LineEdit/constants/minimum_spaces = 12
|
|||
LineEdit/fonts/font = null
|
||||
LineEdit/icons/clear = null
|
||||
LineEdit/styles/focus = null
|
||||
LineEdit/styles/normal = SubResource( 17 )
|
||||
LineEdit/styles/normal = SubResource( 18 )
|
||||
LineEdit/styles/read_only = null
|
||||
MenuButton/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 )
|
||||
MenuButton/colors/font_color_disabled = Color( 1, 1, 1, 0.3 )
|
||||
|
|
@ -427,10 +427,10 @@ OptionButton/styles/focus = null
|
|||
OptionButton/styles/hover = null
|
||||
OptionButton/styles/normal = null
|
||||
OptionButton/styles/pressed = null
|
||||
Panel/styles/panel = SubResource( 18 )
|
||||
Panel/styles/panel = SubResource( 19 )
|
||||
Panel/styles/panelf = null
|
||||
Panel/styles/panelnc = null
|
||||
PanelContainer/styles/panel = SubResource( 19 )
|
||||
PanelContainer/styles/panel = SubResource( 20 )
|
||||
PopupMenu/colors/font_color = Color( 0, 0, 0, 1 )
|
||||
PopupMenu/colors/font_color_accel = Color( 0.270588, 0.270588, 0.270588, 0.8 )
|
||||
PopupMenu/colors/font_color_disabled = Color( 0.4, 0.4, 0.4, 0.8 )
|
||||
|
|
@ -446,10 +446,10 @@ PopupMenu/icons/unchecked = null
|
|||
PopupMenu/styles/hover = null
|
||||
PopupMenu/styles/labeled_separator_left = null
|
||||
PopupMenu/styles/labeled_separator_right = null
|
||||
PopupMenu/styles/panel = SubResource( 20 )
|
||||
PopupMenu/styles/panel = SubResource( 21 )
|
||||
PopupMenu/styles/panel_disabled = null
|
||||
PopupMenu/styles/separator = null
|
||||
PopupPanel/styles/panel = SubResource( 21 )
|
||||
PopupPanel/styles/panel = SubResource( 22 )
|
||||
SpinBox/icons/updown = ExtResource( 6 )
|
||||
TabContainer/colors/font_color_bg = Color( 0, 0, 0, 1 )
|
||||
TabContainer/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 )
|
||||
|
|
@ -466,10 +466,10 @@ TabContainer/icons/increment = null
|
|||
TabContainer/icons/increment_highlight = null
|
||||
TabContainer/icons/menu = null
|
||||
TabContainer/icons/menu_highlight = null
|
||||
TabContainer/styles/panel = SubResource( 22 )
|
||||
TabContainer/styles/tab_bg = SubResource( 23 )
|
||||
TabContainer/styles/tab_disabled = SubResource( 24 )
|
||||
TabContainer/styles/tab_fg = SubResource( 25 )
|
||||
TabContainer/styles/panel = SubResource( 23 )
|
||||
TabContainer/styles/tab_bg = SubResource( 24 )
|
||||
TabContainer/styles/tab_disabled = SubResource( 25 )
|
||||
TabContainer/styles/tab_fg = SubResource( 26 )
|
||||
Tabs/colors/font_color_bg = Color( 0.69, 0.69, 0.69, 1 )
|
||||
Tabs/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 )
|
||||
Tabs/colors/font_color_fg = Color( 0.94, 0.94, 0.94, 1 )
|
||||
|
|
@ -485,10 +485,10 @@ Tabs/icons/increment = null
|
|||
Tabs/icons/increment_highlight = null
|
||||
Tabs/styles/button = null
|
||||
Tabs/styles/button_pressed = null
|
||||
Tabs/styles/panel = SubResource( 22 )
|
||||
Tabs/styles/tab_bg = SubResource( 23 )
|
||||
Tabs/styles/tab_disabled = SubResource( 24 )
|
||||
Tabs/styles/tab_fg = SubResource( 25 )
|
||||
Tabs/styles/panel = SubResource( 23 )
|
||||
Tabs/styles/tab_bg = SubResource( 24 )
|
||||
Tabs/styles/tab_disabled = SubResource( 25 )
|
||||
Tabs/styles/tab_fg = SubResource( 26 )
|
||||
TextEdit/colors/background_color = Color( 0, 0, 0, 0 )
|
||||
TextEdit/colors/brace_mismatch_color = Color( 1, 0.2, 0.2, 1 )
|
||||
TextEdit/colors/breakpoint_color = Color( 0.8, 0.8, 0.4, 0.2 )
|
||||
|
|
@ -520,7 +520,7 @@ TextEdit/fonts/font = null
|
|||
TextEdit/icons/tab = null
|
||||
TextEdit/styles/completion = null
|
||||
TextEdit/styles/focus = null
|
||||
TextEdit/styles/normal = SubResource( 26 )
|
||||
TextEdit/styles/normal = SubResource( 27 )
|
||||
TextEdit/styles/read_only = null
|
||||
Tree/colors/cursor_color = Color( 0, 0, 0, 1 )
|
||||
Tree/colors/custom_button_font_highlight = Color( 0.941176, 0.941176, 0.941176, 1 )
|
||||
|
|
@ -548,7 +548,7 @@ Tree/icons/checked = null
|
|||
Tree/icons/select_arrow = null
|
||||
Tree/icons/unchecked = null
|
||||
Tree/icons/updown = null
|
||||
Tree/styles/bg = SubResource( 27 )
|
||||
Tree/styles/bg = SubResource( 17 )
|
||||
Tree/styles/bg_focus = null
|
||||
Tree/styles/button_pressed = null
|
||||
Tree/styles/cursor = null
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ border_color = Color( 0.321569, 0.321569, 0.321569, 1 )
|
|||
[sub_resource type="StyleBoxFlat" id=19]
|
||||
bg_color = Color( 0.133333, 0.133333, 0.133333, 1 )
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=32]
|
||||
[sub_resource type="StyleBoxFlat" id=20]
|
||||
bg_color = Color( 0.321569, 0.321569, 0.321569, 1 )
|
||||
border_width_left = 4
|
||||
border_width_top = 4
|
||||
|
|
@ -184,7 +184,7 @@ corner_radius_top_right = 4
|
|||
corner_radius_bottom_right = 4
|
||||
corner_radius_bottom_left = 4
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=20]
|
||||
[sub_resource type="StyleBoxFlat" id=21]
|
||||
bg_color = Color( 0.109804, 0.0862745, 0.0862745, 0 )
|
||||
border_width_left = 1
|
||||
border_width_top = 1
|
||||
|
|
@ -197,14 +197,14 @@ corner_radius_bottom_right = 4
|
|||
corner_radius_bottom_left = 4
|
||||
anti_aliasing = false
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=21]
|
||||
[sub_resource type="StyleBoxFlat" id=22]
|
||||
content_margin_left = 0.0
|
||||
content_margin_right = 0.0
|
||||
content_margin_top = 2.0
|
||||
content_margin_bottom = 2.0
|
||||
bg_color = Color( 0.0627451, 0.0627451, 0.0627451, 1 )
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=22]
|
||||
[sub_resource type="StyleBoxFlat" id=23]
|
||||
content_margin_left = 4.5
|
||||
content_margin_right = 4.5
|
||||
content_margin_top = 3.0
|
||||
|
|
@ -215,7 +215,7 @@ corner_radius_top_right = 5
|
|||
corner_radius_bottom_right = 5
|
||||
corner_radius_bottom_left = 5
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=23]
|
||||
[sub_resource type="StyleBoxFlat" id=24]
|
||||
bg_color = Color( 0.2, 0.2, 0.2, 1 )
|
||||
border_width_left = 6
|
||||
border_width_top = 10
|
||||
|
|
@ -228,10 +228,10 @@ corner_radius_bottom_right = 4
|
|||
corner_radius_bottom_left = 4
|
||||
anti_aliasing = false
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=24]
|
||||
[sub_resource type="StyleBoxFlat" id=25]
|
||||
bg_color = Color( 0.2, 0.2, 0.2, 1 )
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=25]
|
||||
[sub_resource type="StyleBoxFlat" id=26]
|
||||
bg_color = Color( 0.321569, 0.321569, 0.321569, 1 )
|
||||
border_width_left = 5
|
||||
border_width_top = 10
|
||||
|
|
@ -244,7 +244,7 @@ corner_radius_bottom_right = 4
|
|||
corner_radius_bottom_left = 4
|
||||
anti_aliasing = false
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=26]
|
||||
[sub_resource type="StyleBoxFlat" id=27]
|
||||
bg_color = Color( 0.2, 0.2, 0.2, 1 )
|
||||
border_width_left = 10
|
||||
border_width_top = 6
|
||||
|
|
@ -252,7 +252,7 @@ border_width_right = 10
|
|||
border_width_bottom = 8
|
||||
border_color = Color( 0.2, 0.2, 0.2, 1 )
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=27]
|
||||
[sub_resource type="StyleBoxFlat" id=28]
|
||||
bg_color = Color( 0.145098, 0.145098, 0.164706, 1 )
|
||||
border_width_left = 10
|
||||
border_width_top = 6
|
||||
|
|
@ -260,7 +260,7 @@ border_width_right = 10
|
|||
border_width_bottom = 8
|
||||
border_color = Color( 0.145098, 0.145098, 0.164706, 1 )
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=28]
|
||||
[sub_resource type="StyleBoxFlat" id=29]
|
||||
bg_color = Color( 0.321569, 0.321569, 0.321569, 1 )
|
||||
border_width_left = 10
|
||||
border_width_top = 6
|
||||
|
|
@ -268,7 +268,7 @@ border_width_right = 10
|
|||
border_width_bottom = 8
|
||||
border_color = Color( 0.321569, 0.321569, 0.321569, 1 )
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=29]
|
||||
[sub_resource type="StyleBoxFlat" id=30]
|
||||
bg_color = Color( 0.321569, 0.321569, 0.321569, 1 )
|
||||
border_width_left = 5
|
||||
border_width_top = 10
|
||||
|
|
@ -277,7 +277,7 @@ border_width_bottom = 5
|
|||
border_color = Color( 0.321569, 0.321569, 0.321569, 1 )
|
||||
anti_aliasing = false
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=30]
|
||||
[sub_resource type="StyleBoxFlat" id=31]
|
||||
bg_color = Color( 0.2, 0.2, 0.2, 1 )
|
||||
border_width_left = 10
|
||||
border_width_top = 6
|
||||
|
|
@ -285,7 +285,7 @@ border_width_right = 10
|
|||
border_width_bottom = 8
|
||||
border_color = Color( 0.2, 0.2, 0.2, 1 )
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=31]
|
||||
[sub_resource type="StyleBoxFlat" id=32]
|
||||
bg_color = Color( 0.321569, 0.321569, 0.321569, 1 )
|
||||
border_width_left = 4
|
||||
border_width_top = 4
|
||||
|
|
@ -427,7 +427,7 @@ ItemList/constants/icon_margin = 4
|
|||
ItemList/constants/line_separation = 2
|
||||
ItemList/constants/vseparation = 4
|
||||
ItemList/fonts/font = null
|
||||
ItemList/styles/bg = SubResource( 32 )
|
||||
ItemList/styles/bg = SubResource( 20 )
|
||||
ItemList/styles/bg_focus = null
|
||||
ItemList/styles/cursor = null
|
||||
ItemList/styles/cursor_unfocused = null
|
||||
|
|
@ -453,7 +453,7 @@ LineEdit/constants/minimum_spaces = 12
|
|||
LineEdit/fonts/font = null
|
||||
LineEdit/icons/clear = null
|
||||
LineEdit/styles/focus = null
|
||||
LineEdit/styles/normal = SubResource( 20 )
|
||||
LineEdit/styles/normal = SubResource( 21 )
|
||||
LineEdit/styles/read_only = null
|
||||
MenuButton/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 )
|
||||
MenuButton/colors/font_color_disabled = Color( 1, 1, 1, 0.3 )
|
||||
|
|
@ -479,10 +479,10 @@ OptionButton/styles/focus = null
|
|||
OptionButton/styles/hover = null
|
||||
OptionButton/styles/normal = null
|
||||
OptionButton/styles/pressed = null
|
||||
Panel/styles/panel = SubResource( 21 )
|
||||
Panel/styles/panel = SubResource( 22 )
|
||||
Panel/styles/panelf = null
|
||||
Panel/styles/panelnc = null
|
||||
PanelContainer/styles/panel = SubResource( 22 )
|
||||
PanelContainer/styles/panel = SubResource( 23 )
|
||||
PopupMenu/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 )
|
||||
PopupMenu/colors/font_color_accel = Color( 0.7, 0.7, 0.7, 0.8 )
|
||||
PopupMenu/colors/font_color_disabled = Color( 0.4, 0.4, 0.4, 0.8 )
|
||||
|
|
@ -498,10 +498,10 @@ PopupMenu/icons/unchecked = null
|
|||
PopupMenu/styles/hover = null
|
||||
PopupMenu/styles/labeled_separator_left = null
|
||||
PopupMenu/styles/labeled_separator_right = null
|
||||
PopupMenu/styles/panel = SubResource( 23 )
|
||||
PopupMenu/styles/panel = SubResource( 24 )
|
||||
PopupMenu/styles/panel_disabled = null
|
||||
PopupMenu/styles/separator = null
|
||||
PopupPanel/styles/panel = SubResource( 24 )
|
||||
PopupPanel/styles/panel = SubResource( 25 )
|
||||
SpinBox/icons/updown = ExtResource( 6 )
|
||||
TabContainer/colors/font_color_bg = Color( 0.690196, 0.690196, 0.690196, 1 )
|
||||
TabContainer/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 )
|
||||
|
|
@ -518,10 +518,10 @@ TabContainer/icons/increment = null
|
|||
TabContainer/icons/increment_highlight = null
|
||||
TabContainer/icons/menu = null
|
||||
TabContainer/icons/menu_highlight = null
|
||||
TabContainer/styles/panel = SubResource( 25 )
|
||||
TabContainer/styles/tab_bg = SubResource( 26 )
|
||||
TabContainer/styles/tab_disabled = SubResource( 27 )
|
||||
TabContainer/styles/tab_fg = SubResource( 28 )
|
||||
TabContainer/styles/panel = SubResource( 26 )
|
||||
TabContainer/styles/tab_bg = SubResource( 27 )
|
||||
TabContainer/styles/tab_disabled = SubResource( 28 )
|
||||
TabContainer/styles/tab_fg = SubResource( 29 )
|
||||
Tabs/colors/font_color_bg = Color( 0.69, 0.69, 0.69, 1 )
|
||||
Tabs/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 )
|
||||
Tabs/colors/font_color_fg = Color( 0.94, 0.94, 0.94, 1 )
|
||||
|
|
@ -537,10 +537,10 @@ Tabs/icons/increment = null
|
|||
Tabs/icons/increment_highlight = null
|
||||
Tabs/styles/button = null
|
||||
Tabs/styles/button_pressed = null
|
||||
Tabs/styles/panel = SubResource( 29 )
|
||||
Tabs/styles/tab_bg = SubResource( 30 )
|
||||
Tabs/styles/tab_disabled = SubResource( 27 )
|
||||
Tabs/styles/tab_fg = SubResource( 28 )
|
||||
Tabs/styles/panel = SubResource( 30 )
|
||||
Tabs/styles/tab_bg = SubResource( 31 )
|
||||
Tabs/styles/tab_disabled = SubResource( 28 )
|
||||
Tabs/styles/tab_fg = SubResource( 29 )
|
||||
TextEdit/colors/background_color = Color( 0, 0, 0, 0 )
|
||||
TextEdit/colors/brace_mismatch_color = Color( 1, 0.2, 0.2, 1 )
|
||||
TextEdit/colors/breakpoint_color = Color( 0.8, 0.8, 0.4, 0.2 )
|
||||
|
|
@ -572,7 +572,7 @@ TextEdit/fonts/font = null
|
|||
TextEdit/icons/tab = null
|
||||
TextEdit/styles/completion = null
|
||||
TextEdit/styles/focus = null
|
||||
TextEdit/styles/normal = SubResource( 31 )
|
||||
TextEdit/styles/normal = SubResource( 32 )
|
||||
TextEdit/styles/read_only = null
|
||||
TooltipLabel/colors/font_color = Color( 1, 1, 1, 1 )
|
||||
TooltipLabel/colors/font_color_shadow = Color( 0, 0, 0, 0.1 )
|
||||
|
|
@ -605,7 +605,7 @@ Tree/icons/checked = null
|
|||
Tree/icons/select_arrow = null
|
||||
Tree/icons/unchecked = null
|
||||
Tree/icons/updown = null
|
||||
Tree/styles/bg = SubResource( 32 )
|
||||
Tree/styles/bg = SubResource( 20 )
|
||||
Tree/styles/bg_focus = null
|
||||
Tree/styles/button_pressed = null
|
||||
Tree/styles/cursor = null
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@ border_color = Color( 0.321569, 0.321569, 0.321569, 1 )
|
|||
expand_margin_top = 2.0
|
||||
expand_margin_bottom = 2.0
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=28]
|
||||
[sub_resource type="StyleBoxFlat" id=18]
|
||||
bg_color = Color( 0.321569, 0.321569, 0.321569, 1 )
|
||||
border_width_left = 4
|
||||
border_width_top = 4
|
||||
|
|
@ -177,7 +177,7 @@ corner_radius_top_right = 4
|
|||
corner_radius_bottom_right = 4
|
||||
corner_radius_bottom_left = 4
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=18]
|
||||
[sub_resource type="StyleBoxFlat" id=19]
|
||||
bg_color = Color( 0.109804, 0.0862745, 0.0862745, 0 )
|
||||
border_width_left = 1
|
||||
border_width_top = 1
|
||||
|
|
@ -190,10 +190,10 @@ corner_radius_bottom_right = 4
|
|||
corner_radius_bottom_left = 4
|
||||
anti_aliasing = false
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=19]
|
||||
[sub_resource type="StyleBoxFlat" id=20]
|
||||
bg_color = Color( 0.180392, 0.180392, 0.180392, 1 )
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=20]
|
||||
[sub_resource type="StyleBoxFlat" id=21]
|
||||
content_margin_left = 4.5
|
||||
content_margin_right = 4.5
|
||||
content_margin_top = 3.0
|
||||
|
|
@ -204,7 +204,7 @@ corner_radius_top_right = 5
|
|||
corner_radius_bottom_right = 5
|
||||
corner_radius_bottom_left = 5
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=21]
|
||||
[sub_resource type="StyleBoxFlat" id=22]
|
||||
bg_color = Color( 0.2, 0.2, 0.2, 1 )
|
||||
border_width_left = 6
|
||||
border_width_top = 10
|
||||
|
|
@ -217,10 +217,10 @@ corner_radius_bottom_right = 4
|
|||
corner_radius_bottom_left = 4
|
||||
anti_aliasing = false
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=22]
|
||||
[sub_resource type="StyleBoxFlat" id=23]
|
||||
bg_color = Color( 0.2, 0.2, 0.2, 1 )
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=23]
|
||||
[sub_resource type="StyleBoxFlat" id=24]
|
||||
bg_color = Color( 0.321569, 0.321569, 0.321569, 1 )
|
||||
border_width_left = 5
|
||||
border_width_top = 10
|
||||
|
|
@ -233,7 +233,7 @@ corner_radius_bottom_right = 4
|
|||
corner_radius_bottom_left = 4
|
||||
anti_aliasing = false
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=24]
|
||||
[sub_resource type="StyleBoxFlat" id=25]
|
||||
bg_color = Color( 0.2, 0.2, 0.2, 1 )
|
||||
border_width_left = 10
|
||||
border_width_top = 6
|
||||
|
|
@ -241,7 +241,7 @@ border_width_right = 10
|
|||
border_width_bottom = 8
|
||||
border_color = Color( 0.2, 0.2, 0.2, 1 )
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=25]
|
||||
[sub_resource type="StyleBoxFlat" id=26]
|
||||
bg_color = Color( 0.145098, 0.145098, 0.164706, 1 )
|
||||
border_width_left = 10
|
||||
border_width_top = 6
|
||||
|
|
@ -249,7 +249,7 @@ border_width_right = 10
|
|||
border_width_bottom = 8
|
||||
border_color = Color( 0.145098, 0.145098, 0.164706, 1 )
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=26]
|
||||
[sub_resource type="StyleBoxFlat" id=27]
|
||||
bg_color = Color( 0.321569, 0.321569, 0.321569, 1 )
|
||||
border_width_left = 10
|
||||
border_width_top = 6
|
||||
|
|
@ -257,7 +257,7 @@ border_width_right = 10
|
|||
border_width_bottom = 8
|
||||
border_color = Color( 0.321569, 0.321569, 0.321569, 1 )
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=27]
|
||||
[sub_resource type="StyleBoxFlat" id=28]
|
||||
bg_color = Color( 0.321569, 0.321569, 0.321569, 1 )
|
||||
border_width_left = 4
|
||||
border_width_top = 4
|
||||
|
|
@ -378,7 +378,7 @@ ItemList/constants/icon_margin = 4
|
|||
ItemList/constants/line_separation = 2
|
||||
ItemList/constants/vseparation = 4
|
||||
ItemList/fonts/font = null
|
||||
ItemList/styles/bg = SubResource( 28 )
|
||||
ItemList/styles/bg = SubResource( 18 )
|
||||
ItemList/styles/bg_focus = null
|
||||
ItemList/styles/cursor = null
|
||||
ItemList/styles/cursor_unfocused = null
|
||||
|
|
@ -404,7 +404,7 @@ LineEdit/constants/minimum_spaces = 12
|
|||
LineEdit/fonts/font = null
|
||||
LineEdit/icons/clear = null
|
||||
LineEdit/styles/focus = null
|
||||
LineEdit/styles/normal = SubResource( 18 )
|
||||
LineEdit/styles/normal = SubResource( 19 )
|
||||
LineEdit/styles/read_only = null
|
||||
MenuButton/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 )
|
||||
MenuButton/colors/font_color_disabled = Color( 1, 1, 1, 0.3 )
|
||||
|
|
@ -430,10 +430,10 @@ OptionButton/styles/focus = null
|
|||
OptionButton/styles/hover = null
|
||||
OptionButton/styles/normal = null
|
||||
OptionButton/styles/pressed = null
|
||||
Panel/styles/panel = SubResource( 19 )
|
||||
Panel/styles/panel = SubResource( 20 )
|
||||
Panel/styles/panelf = null
|
||||
Panel/styles/panelnc = null
|
||||
PanelContainer/styles/panel = SubResource( 20 )
|
||||
PanelContainer/styles/panel = SubResource( 21 )
|
||||
PopupMenu/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 )
|
||||
PopupMenu/colors/font_color_accel = Color( 0.7, 0.7, 0.7, 0.8 )
|
||||
PopupMenu/colors/font_color_disabled = Color( 0.4, 0.4, 0.4, 0.8 )
|
||||
|
|
@ -449,10 +449,10 @@ PopupMenu/icons/unchecked = null
|
|||
PopupMenu/styles/hover = null
|
||||
PopupMenu/styles/labeled_separator_left = null
|
||||
PopupMenu/styles/labeled_separator_right = null
|
||||
PopupMenu/styles/panel = SubResource( 21 )
|
||||
PopupMenu/styles/panel = SubResource( 22 )
|
||||
PopupMenu/styles/panel_disabled = null
|
||||
PopupMenu/styles/separator = null
|
||||
PopupPanel/styles/panel = SubResource( 22 )
|
||||
PopupPanel/styles/panel = SubResource( 23 )
|
||||
SpinBox/icons/updown = ExtResource( 4 )
|
||||
TabContainer/colors/font_color_bg = Color( 0.690196, 0.690196, 0.690196, 1 )
|
||||
TabContainer/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 )
|
||||
|
|
@ -469,10 +469,10 @@ TabContainer/icons/increment = null
|
|||
TabContainer/icons/increment_highlight = null
|
||||
TabContainer/icons/menu = null
|
||||
TabContainer/icons/menu_highlight = null
|
||||
TabContainer/styles/panel = SubResource( 23 )
|
||||
TabContainer/styles/tab_bg = SubResource( 24 )
|
||||
TabContainer/styles/tab_disabled = SubResource( 25 )
|
||||
TabContainer/styles/tab_fg = SubResource( 26 )
|
||||
TabContainer/styles/panel = SubResource( 24 )
|
||||
TabContainer/styles/tab_bg = SubResource( 25 )
|
||||
TabContainer/styles/tab_disabled = SubResource( 26 )
|
||||
TabContainer/styles/tab_fg = SubResource( 27 )
|
||||
Tabs/colors/font_color_bg = Color( 0.69, 0.69, 0.69, 1 )
|
||||
Tabs/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 )
|
||||
Tabs/colors/font_color_fg = Color( 0.94, 0.94, 0.94, 1 )
|
||||
|
|
@ -488,10 +488,10 @@ Tabs/icons/increment = null
|
|||
Tabs/icons/increment_highlight = null
|
||||
Tabs/styles/button = null
|
||||
Tabs/styles/button_pressed = null
|
||||
Tabs/styles/panel = SubResource( 23 )
|
||||
Tabs/styles/tab_bg = SubResource( 24 )
|
||||
Tabs/styles/tab_disabled = SubResource( 25 )
|
||||
Tabs/styles/tab_fg = SubResource( 26 )
|
||||
Tabs/styles/panel = SubResource( 24 )
|
||||
Tabs/styles/tab_bg = SubResource( 25 )
|
||||
Tabs/styles/tab_disabled = SubResource( 26 )
|
||||
Tabs/styles/tab_fg = SubResource( 27 )
|
||||
TextEdit/colors/background_color = Color( 0, 0, 0, 0 )
|
||||
TextEdit/colors/brace_mismatch_color = Color( 1, 0.2, 0.2, 1 )
|
||||
TextEdit/colors/breakpoint_color = Color( 0.8, 0.8, 0.4, 0.2 )
|
||||
|
|
@ -523,7 +523,7 @@ TextEdit/fonts/font = null
|
|||
TextEdit/icons/tab = null
|
||||
TextEdit/styles/completion = null
|
||||
TextEdit/styles/focus = null
|
||||
TextEdit/styles/normal = SubResource( 27 )
|
||||
TextEdit/styles/normal = SubResource( 28 )
|
||||
TextEdit/styles/read_only = null
|
||||
Tree/colors/cursor_color = Color( 0, 0, 0, 1 )
|
||||
Tree/colors/custom_button_font_highlight = Color( 0.941176, 0.941176, 0.941176, 1 )
|
||||
|
|
@ -551,7 +551,7 @@ Tree/icons/checked = null
|
|||
Tree/icons/select_arrow = null
|
||||
Tree/icons/unchecked = null
|
||||
Tree/icons/updown = null
|
||||
Tree/styles/bg = SubResource( 28 )
|
||||
Tree/styles/bg = SubResource( 18 )
|
||||
Tree/styles/bg_focus = null
|
||||
Tree/styles/button_pressed = null
|
||||
Tree/styles/cursor = null
|
||||
|
|
|
|||
|
|
@ -5,9 +5,6 @@
|
|||
[ext_resource path="res://assets/graphics/dark_themes/timeline/remove_frame.png" type="Texture" id=3]
|
||||
[ext_resource path="res://assets/graphics/palette/palette_button_fill.png" type="Texture" id=6]
|
||||
|
||||
|
||||
|
||||
|
||||
[node name="EditPalettePopup" type="WindowDialog"]
|
||||
margin_right = 600.0
|
||||
margin_bottom = 550.0
|
||||
|
|
@ -31,10 +28,8 @@ margin_bottom = 462.0
|
|||
size_flags_vertical = 3
|
||||
|
||||
[node name="EditPaletteColorPicker" type="ColorPicker" parent="VBoxContainer/HBoxContainer"]
|
||||
margin_left = 4.0
|
||||
margin_top = 4.0
|
||||
margin_right = 4.0
|
||||
margin_bottom = 4.0
|
||||
margin_right = 308.0
|
||||
margin_bottom = 462.0
|
||||
|
||||
[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer"]
|
||||
margin_left = 312.0
|
||||
|
|
@ -73,6 +68,7 @@ margin_right = 244.0
|
|||
margin_bottom = 426.0
|
||||
text = "Use current left & right colors"
|
||||
align = 1
|
||||
autowrap = true
|
||||
|
||||
[node name="CenterContainer" type="CenterContainer" parent="VBoxContainer/HBoxContainer/VBoxContainer"]
|
||||
margin_top = 430.0
|
||||
|
|
|
|||
|
|
@ -143,8 +143,9 @@ func deserialize(input_string : String): # -> Palette
|
|||
result.comments = data.comments
|
||||
if data.has("editable"):
|
||||
result.editable = data.editable
|
||||
for color_data in data.colors:
|
||||
result.add_color(color_data.data, color_data.name)
|
||||
if data.has("colors"):
|
||||
for color_data in data.colors:
|
||||
result.add_color(color_data.data, color_data.name)
|
||||
|
||||
return result
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue