diff --git a/assets/themes/blue/theme.tres b/assets/themes/blue/theme.tres index 516ba4146..c9b793948 100644 --- a/assets/themes/blue/theme.tres +++ b/assets/themes/blue/theme.tres @@ -1452,7 +1452,7 @@ Button/colors/font_color_pressed = Color( 0.41, 0.61, 0.91, 1 ) Button/colors/icon_color_hover = Color( 1.15, 1.15, 1.15, 1 ) Button/colors/icon_color_pressed = Color( 0.4715, 0.7015, 1.0465, 1 ) Button/constants/hseparation = 2 -Button/fonts/font = null +Button/fonts/font = ExtResource( 1 ) Button/styles/Ruler = SubResource( 1 ) Button/styles/disabled = SubResource( 2 ) Button/styles/focus = SubResource( 3 ) @@ -1467,7 +1467,7 @@ CheckBox/colors/font_color_pressed = Color( 0.41, 0.61, 0.91, 1 ) CheckBox/colors/icon_color_hover = Color( 1.15, 1.15, 1.15, 1 ) CheckBox/constants/check_vadjust = 0 CheckBox/constants/hseparation = 4 -CheckBox/fonts/font = null +CheckBox/fonts/font = ExtResource( 1 ) CheckBox/icons/checked = SubResource( 8 ) CheckBox/icons/radio_checked = SubResource( 10 ) CheckBox/icons/radio_unchecked = SubResource( 12 ) @@ -1575,7 +1575,6 @@ ItemList/styles/cursor = SubResource( 88 ) ItemList/styles/cursor_unfocused = SubResource( 88 ) ItemList/styles/selected = SubResource( 89 ) ItemList/styles/selected_focus = SubResource( 90 ) -"Label/colors/Selected Color" = Color( 0.545098, 0.619608, 0.788235, 1 ) Label/colors/font_color = Color( 0.8, 0.8075, 0.8275, 1 ) Label/colors/font_color_shadow = Color( 0, 0, 0, 0 ) Label/constants/line_spacing = 3 @@ -1591,7 +1590,7 @@ LineEdit/colors/font_color_selected = Color( 1, 1, 1, 1 ) LineEdit/colors/read_only = Color( 1, 1, 1, 0.3 ) LineEdit/colors/selection_color = Color( 0.41, 0.61, 0.91, 0.4 ) LineEdit/constants/minimum_spaces = 12 -LineEdit/fonts/font = null +LineEdit/fonts/font = ExtResource( 1 ) LineEdit/icons/clear = SubResource( 93 ) LineEdit/styles/focus = SubResource( 3 ) LineEdit/styles/normal = SubResource( 5 ) @@ -1607,7 +1606,7 @@ MenuButton/colors/font_color_disabled = Color( 1, 1, 1, 0.3 ) MenuButton/colors/font_color_hover = Color( 0.88, 0.8845, 0.8965, 1 ) MenuButton/colors/font_color_pressed = Color( 1, 1, 1, 1 ) MenuButton/constants/hseparation = 3 -MenuButton/fonts/font = null +MenuButton/fonts/font = ExtResource( 1 ) MenuButton/styles/disabled = SubResource( 22 ) MenuButton/styles/focus = SubResource( 22 ) MenuButton/styles/hover = SubResource( 22 ) @@ -1675,7 +1674,7 @@ TabContainer/constants/label_valign_bg = 2 TabContainer/constants/label_valign_fg = 0 TabContainer/constants/side_margin = 0 TabContainer/constants/top_margin = 24 -TabContainer/fonts/font = null +TabContainer/fonts/font = ExtResource( 1 ) TabContainer/icons/decrement = SubResource( 121 ) TabContainer/icons/decrement_highlight = SubResource( 123 ) TabContainer/icons/increment = SubResource( 125 ) @@ -1777,7 +1776,7 @@ WindowDialog/colors/title_color = Color( 0.8, 0.8075, 0.8275, 1 ) WindowDialog/constants/close_h_ofs = 22 WindowDialog/constants/close_v_ofs = 20 WindowDialog/constants/title_height = 24 -WindowDialog/fonts/title_font = null +WindowDialog/fonts/title_font = ExtResource( 1 ) WindowDialog/icons/close = SubResource( 93 ) WindowDialog/icons/close_highlight = SubResource( 93 ) WindowDialog/styles/panel = SubResource( 168 ) diff --git a/assets/themes/caramel/theme.tres b/assets/themes/caramel/theme.tres index 709862ba8..2e3e9f192 100644 --- a/assets/themes/caramel/theme.tres +++ b/assets/themes/caramel/theme.tres @@ -1477,7 +1477,7 @@ Button/colors/font_color_pressed = Color( 1, 0.819608, 0.00392157, 1 ) Button/colors/icon_color_hover = Color( 1.45, 1.45, 1.45, 1 ) Button/colors/icon_color_pressed = Color( 3.5, 2.86863, 0.0137255, 1 ) Button/constants/hseparation = 2 -Button/fonts/font = null +Button/fonts/font = ExtResource( 1 ) Button/styles/Ruler = SubResource( 1 ) Button/styles/disabled = SubResource( 2 ) Button/styles/focus = SubResource( 3 ) @@ -1492,7 +1492,7 @@ CheckBox/colors/font_color_pressed = Color( 1, 0.819608, 0.00392157, 1 ) CheckBox/colors/icon_color_hover = Color( 1.45, 1.45, 1.45, 1 ) CheckBox/constants/check_vadjust = 0 CheckBox/constants/hseparation = 4 -CheckBox/fonts/font = null +CheckBox/fonts/font = ExtResource( 1 ) CheckBox/icons/checked = SubResource( 8 ) CheckBox/icons/radio_checked = SubResource( 10 ) CheckBox/icons/radio_unchecked = SubResource( 12 ) @@ -1534,7 +1534,7 @@ ColorPickerButton/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.3 ) ColorPickerButton/colors/font_color_hover = Color( 1, 1, 1, 1 ) ColorPickerButton/colors/font_color_pressed = Color( 0.8, 0.8, 0.8, 1 ) ColorPickerButton/constants/hseparation = 2 -ColorPickerButton/fonts/font = null +ColorPickerButton/fonts/font = ExtResource( 1 ) ColorPickerButton/icons/bg = SubResource( 29 ) ColorPickerButton/styles/disabled = null ColorPickerButton/styles/focus = null @@ -1616,14 +1616,13 @@ ItemList/constants/hseparation = 3 ItemList/constants/icon_margin = 4 ItemList/constants/line_separation = 3 ItemList/constants/vseparation = 3 -ItemList/fonts/font = null +ItemList/fonts/font = ExtResource( 1 ) ItemList/styles/bg = SubResource( 88 ) ItemList/styles/bg_focus = SubResource( 89 ) ItemList/styles/cursor = SubResource( 90 ) ItemList/styles/cursor_unfocused = SubResource( 90 ) ItemList/styles/selected = SubResource( 91 ) ItemList/styles/selected_focus = SubResource( 92 ) -"Label/colors/Selected Color" = Color( 0.235294, 0.364706, 0.458824, 1 ) Label/colors/font_color = Color( 0.237305, 0.193295, 0.141827, 1 ) Label/colors/font_color_shadow = Color( 0, 0, 0, 0 ) Label/colors/font_outline_modulate = Color( 0, 0, 0, 1 ) @@ -1631,7 +1630,7 @@ Label/constants/line_spacing = 3 Label/constants/shadow_as_outline = 0 Label/constants/shadow_offset_x = 1 Label/constants/shadow_offset_y = 1 -Label/fonts/font = null +Label/fonts/font = ExtResource( 1 ) Label/styles/normal = SubResource( 93 ) LineEdit/colors/clear_button_color = Color( 0.237305, 0.193295, 0.141827, 1 ) LineEdit/colors/clear_button_color_pressed = Color( 1, 0.819608, 0.00392157, 1 ) @@ -1641,7 +1640,7 @@ LineEdit/colors/font_color_selected = Color( 0, 0, 0, 1 ) LineEdit/colors/read_only = Color( 0, 0, 0, 0.3 ) LineEdit/colors/selection_color = Color( 1, 0.819608, 0.00392157, 0.4 ) LineEdit/constants/minimum_spaces = 12 -LineEdit/fonts/font = null +LineEdit/fonts/font = ExtResource( 1 ) LineEdit/icons/clear = SubResource( 95 ) LineEdit/styles/focus = SubResource( 3 ) LineEdit/styles/normal = SubResource( 5 ) @@ -1657,7 +1656,7 @@ MenuButton/colors/font_color_disabled = Color( 1, 1, 1, 0.3 ) MenuButton/colors/font_color_hover = Color( 0.142383, 0.115977, 0.085096, 1 ) MenuButton/colors/font_color_pressed = Color( 1, 1, 1, 1 ) MenuButton/constants/hseparation = 3 -MenuButton/fonts/font = null +MenuButton/fonts/font = ExtResource( 1 ) MenuButton/styles/disabled = SubResource( 23 ) MenuButton/styles/focus = SubResource( 23 ) MenuButton/styles/hover = SubResource( 23 ) @@ -1672,7 +1671,7 @@ OptionButton/colors/icon_color_hover = Color( 1.45, 1.45, 1.45, 1 ) OptionButton/constants/arrow_margin = 4 OptionButton/constants/hseparation = 4 OptionButton/constants/modulate_arrow = 1 -OptionButton/fonts/font = null +OptionButton/fonts/font = ExtResource( 1 ) OptionButton/icons/arrow = SubResource( 97 ) OptionButton/styles/disabled = SubResource( 2 ) OptionButton/styles/focus = SubResource( 3 ) @@ -1691,7 +1690,7 @@ PopupMenu/colors/font_color_disabled = Color( 0, 0, 0, 0.3 ) PopupMenu/colors/font_color_hover = Color( 0.142383, 0.115977, 0.085096, 1 ) PopupMenu/constants/hseparation = 4 PopupMenu/constants/vseparation = 5 -PopupMenu/fonts/font = null +PopupMenu/fonts/font = ExtResource( 1 ) PopupMenu/icons/checked = SubResource( 8 ) PopupMenu/icons/radio_checked = SubResource( 10 ) PopupMenu/icons/radio_unchecked = SubResource( 12 ) @@ -1731,7 +1730,7 @@ TabContainer/constants/label_valign_bg = 2 TabContainer/constants/label_valign_fg = 0 TabContainer/constants/side_margin = 0 TabContainer/constants/top_margin = 24 -TabContainer/fonts/font = null +TabContainer/fonts/font = ExtResource( 1 ) TabContainer/icons/decrement = SubResource( 123 ) TabContainer/icons/decrement_highlight = SubResource( 125 ) TabContainer/icons/increment = SubResource( 127 ) @@ -1749,7 +1748,7 @@ Tabs/constants/hseparation = 4 Tabs/constants/label_valign_bg = 2 Tabs/constants/label_valign_fg = 0 Tabs/constants/top_margin = 24 -Tabs/fonts/font = null +Tabs/fonts/font = ExtResource( 1 ) Tabs/icons/close = SubResource( 95 ) Tabs/icons/decrement = SubResource( 123 ) Tabs/icons/decrement_highlight = SubResource( 125 ) @@ -1788,7 +1787,7 @@ TextEdit/constants/completion_lines = 7 TextEdit/constants/completion_max_width = 50 TextEdit/constants/completion_scroll_width = 3 TextEdit/constants/line_spacing = 4 -TextEdit/fonts/font = null +TextEdit/fonts/font = ExtResource( 1 ) TextEdit/icons/fold = SubResource( 140 ) TextEdit/icons/folded = SubResource( 142 ) TextEdit/icons/space = SubResource( 144 ) @@ -1826,8 +1825,8 @@ Tree/constants/item_margin = 12 Tree/constants/scroll_border = 40 Tree/constants/scroll_speed = 12 Tree/constants/vseparation = 4 -Tree/fonts/font = null -Tree/fonts/title_button_font = null +Tree/fonts/font = ExtResource( 1 ) +Tree/fonts/title_button_font = ExtResource( 1 ) Tree/icons/arrow = SubResource( 140 ) Tree/icons/arrow_collapsed = SubResource( 142 ) Tree/icons/checked = SubResource( 8 ) @@ -1873,7 +1872,7 @@ WindowDialog/constants/close_h_ofs = 22 WindowDialog/constants/close_v_ofs = 20 WindowDialog/constants/scaleborder_size = 4 WindowDialog/constants/title_height = 24 -WindowDialog/fonts/title_font = null +WindowDialog/fonts/title_font = ExtResource( 1 ) WindowDialog/icons/close = SubResource( 95 ) WindowDialog/icons/close_highlight = SubResource( 95 ) WindowDialog/styles/panel = SubResource( 171 ) diff --git a/assets/themes/dark/theme.tres b/assets/themes/dark/theme.tres index 1701b5713..656747316 100644 --- a/assets/themes/dark/theme.tres +++ b/assets/themes/dark/theme.tres @@ -1515,7 +1515,7 @@ Button/colors/font_color_pressed = Color( 0.184314, 0.396078, 0.533333, 1 ) Button/colors/icon_color_hover = Color( 1.15, 1.15, 1.15, 1 ) Button/colors/icon_color_pressed = Color( 0.211961, 0.45549, 0.613333, 1 ) Button/constants/hseparation = 2 -Button/fonts/font = null +Button/fonts/font = ExtResource( 1 ) Button/styles/Ruler = SubResource( 1 ) Button/styles/disabled = SubResource( 2 ) Button/styles/focus = SubResource( 3 ) @@ -1530,7 +1530,7 @@ CheckBox/colors/font_color_pressed = Color( 0.184314, 0.396078, 0.533333, 1 ) CheckBox/colors/icon_color_hover = Color( 1.15, 1.15, 1.15, 1 ) CheckBox/constants/check_vadjust = 0 CheckBox/constants/hseparation = 4 -CheckBox/fonts/font = null +CheckBox/fonts/font = ExtResource( 1 ) CheckBox/icons/checked = SubResource( 8 ) CheckBox/icons/radio_checked = SubResource( 10 ) CheckBox/icons/radio_unchecked = SubResource( 12 ) @@ -1549,7 +1549,7 @@ CheckButton/colors/font_color_pressed = Color( 0.184314, 0.396078, 0.533333, 1 ) CheckButton/colors/icon_color_hover = Color( 1.15, 1.15, 1.15, 1 ) CheckButton/constants/check_vadjust = 0 CheckButton/constants/hseparation = 4 -CheckButton/fonts/font = null +CheckButton/fonts/font = ExtResource( 1 ) CheckButton/icons/off = SubResource( 18 ) CheckButton/icons/off_disabled = SubResource( 20 ) CheckButton/icons/on = SubResource( 22 ) @@ -1576,7 +1576,7 @@ ColorPickerButton/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.3 ) ColorPickerButton/colors/font_color_hover = Color( 1, 1, 1, 1 ) ColorPickerButton/colors/font_color_pressed = Color( 0.8, 0.8, 0.8, 1 ) ColorPickerButton/constants/hseparation = 2 -ColorPickerButton/fonts/font = null +ColorPickerButton/fonts/font = ExtResource( 1 ) ColorPickerButton/icons/bg = SubResource( 30 ) ColorPickerButton/styles/disabled = null ColorPickerButton/styles/focus = null @@ -1659,14 +1659,13 @@ ItemList/constants/hseparation = 3 ItemList/constants/icon_margin = 4 ItemList/constants/line_separation = 3 ItemList/constants/vseparation = 3 -ItemList/fonts/font = null +ItemList/fonts/font = ExtResource( 1 ) ItemList/styles/bg = SubResource( 92 ) ItemList/styles/bg_focus = SubResource( 93 ) ItemList/styles/cursor = SubResource( 94 ) ItemList/styles/cursor_unfocused = SubResource( 94 ) ItemList/styles/selected = SubResource( 95 ) ItemList/styles/selected_focus = SubResource( 96 ) -"Label/colors/Selected Color" = Color( 0.235294, 0.364706, 0.458824, 1 ) Label/colors/font_color = Color( 0.77832, 0.77832, 0.77832, 1 ) Label/colors/font_color_shadow = Color( 0, 0, 0, 0 ) Label/colors/font_outline_modulate = Color( 1, 1, 1, 1 ) @@ -1674,7 +1673,7 @@ Label/constants/line_spacing = 3 Label/constants/shadow_as_outline = 0 Label/constants/shadow_offset_x = 1 Label/constants/shadow_offset_y = 1 -Label/fonts/font = null +Label/fonts/font = ExtResource( 1 ) Label/styles/normal = SubResource( 97 ) LineEdit/colors/clear_button_color = Color( 0.77832, 0.77832, 0.77832, 1 ) LineEdit/colors/clear_button_color_pressed = Color( 0.184314, 0.396078, 0.533333, 1 ) @@ -1684,7 +1683,7 @@ LineEdit/colors/font_color_selected = Color( 1, 1, 1, 1 ) LineEdit/colors/read_only = Color( 1, 1, 1, 0.3 ) LineEdit/colors/selection_color = Color( 0.184314, 0.396078, 0.533333, 0.4 ) LineEdit/constants/minimum_spaces = 12 -LineEdit/fonts/font = null +LineEdit/fonts/font = ExtResource( 1 ) LineEdit/icons/clear = SubResource( 99 ) LineEdit/styles/focus = SubResource( 3 ) LineEdit/styles/normal = SubResource( 5 ) @@ -1703,7 +1702,7 @@ MenuButton/colors/font_color_disabled = Color( 1, 1, 1, 0.3 ) MenuButton/colors/font_color_hover = Color( 0.866992, 0.866992, 0.866992, 1 ) MenuButton/colors/font_color_pressed = Color( 1, 1, 1, 1 ) MenuButton/constants/hseparation = 3 -MenuButton/fonts/font = null +MenuButton/fonts/font = ExtResource( 1 ) MenuButton/styles/disabled = SubResource( 23 ) MenuButton/styles/focus = SubResource( 23 ) MenuButton/styles/hover = SubResource( 23 ) @@ -1718,7 +1717,7 @@ OptionButton/colors/icon_color_hover = Color( 1.15, 1.15, 1.15, 1 ) OptionButton/constants/arrow_margin = 4 OptionButton/constants/hseparation = 4 OptionButton/constants/modulate_arrow = 1 -OptionButton/fonts/font = null +OptionButton/fonts/font = ExtResource( 1 ) OptionButton/icons/arrow = SubResource( 101 ) OptionButton/styles/disabled = SubResource( 2 ) OptionButton/styles/focus = SubResource( 3 ) @@ -1737,7 +1736,7 @@ PopupMenu/colors/font_color_disabled = Color( 1, 1, 1, 0.3 ) PopupMenu/colors/font_color_hover = Color( 0.866992, 0.866992, 0.866992, 1 ) PopupMenu/constants/hseparation = 4 PopupMenu/constants/vseparation = 5 -PopupMenu/fonts/font = null +PopupMenu/fonts/font = ExtResource( 1 ) PopupMenu/icons/checked = SubResource( 8 ) PopupMenu/icons/radio_checked = SubResource( 10 ) PopupMenu/icons/radio_unchecked = SubResource( 12 ) @@ -1777,7 +1776,7 @@ TabContainer/constants/label_valign_bg = 2 TabContainer/constants/label_valign_fg = 0 TabContainer/constants/side_margin = 0 TabContainer/constants/top_margin = 24 -TabContainer/fonts/font = null +TabContainer/fonts/font = ExtResource( 1 ) TabContainer/icons/decrement = SubResource( 127 ) TabContainer/icons/decrement_highlight = SubResource( 129 ) TabContainer/icons/increment = SubResource( 131 ) @@ -1795,7 +1794,7 @@ Tabs/constants/hseparation = 4 Tabs/constants/label_valign_bg = 2 Tabs/constants/label_valign_fg = 0 Tabs/constants/top_margin = 24 -Tabs/fonts/font = null +Tabs/fonts/font = ExtResource( 1 ) Tabs/icons/close = SubResource( 99 ) Tabs/icons/decrement = SubResource( 127 ) Tabs/icons/decrement_highlight = SubResource( 129 ) @@ -1834,7 +1833,7 @@ TextEdit/constants/completion_lines = 7 TextEdit/constants/completion_max_width = 50 TextEdit/constants/completion_scroll_width = 3 TextEdit/constants/line_spacing = 4 -TextEdit/fonts/font = null +TextEdit/fonts/font = ExtResource( 1 ) TextEdit/icons/fold = SubResource( 144 ) TextEdit/icons/folded = SubResource( 146 ) TextEdit/icons/space = SubResource( 148 ) @@ -1855,7 +1854,7 @@ TooltipLabel/colors/font_color = Color( 0.22168, 0.22168, 0.22168, 1 ) TooltipLabel/colors/font_color_shadow = Color( 0, 0, 0, 0.1 ) TooltipLabel/constants/shadow_offset_x = 1 TooltipLabel/constants/shadow_offset_y = 1 -TooltipLabel/fonts/font = null +TooltipLabel/fonts/font = ExtResource( 1 ) TooltipPanel/styles/panel = SubResource( 151 ) Tree/colors/cursor_color = Color( 0, 0, 0, 1 ) Tree/colors/custom_button_font_highlight = Color( 0.866992, 0.866992, 0.866992, 1 ) @@ -1875,8 +1874,8 @@ Tree/constants/item_margin = 12 Tree/constants/scroll_border = 40 Tree/constants/scroll_speed = 12 Tree/constants/vseparation = 4 -Tree/fonts/font = null -Tree/fonts/title_button_font = null +Tree/fonts/font = ExtResource( 1 ) +Tree/fonts/title_button_font = ExtResource( 1 ) Tree/icons/arrow = SubResource( 144 ) Tree/icons/arrow_collapsed = SubResource( 146 ) Tree/icons/checked = SubResource( 8 ) @@ -1923,7 +1922,7 @@ WindowDialog/constants/close_h_ofs = 22 WindowDialog/constants/close_v_ofs = 20 WindowDialog/constants/scaleborder_size = 4 WindowDialog/constants/title_height = 24 -WindowDialog/fonts/title_font = null +WindowDialog/fonts/title_font = ExtResource( 1 ) WindowDialog/icons/close = SubResource( 99 ) WindowDialog/icons/close_highlight = SubResource( 99 ) WindowDialog/styles/panel = SubResource( 176 ) diff --git a/assets/themes/gray/theme.tres b/assets/themes/gray/theme.tres index 72939fa3c..9fd2cea21 100644 --- a/assets/themes/gray/theme.tres +++ b/assets/themes/gray/theme.tres @@ -1516,7 +1516,7 @@ Button/colors/font_color_pressed = Color( 0.00392157, 0.454902, 0.741176, 1 ) Button/colors/icon_color_hover = Color( 1.15, 1.15, 1.15, 1 ) Button/colors/icon_color_pressed = Color( 0.0045098, 0.523137, 0.852353, 1 ) Button/constants/hseparation = 2 -Button/fonts/font = null +Button/fonts/font = ExtResource( 1 ) Button/styles/Ruler = SubResource( 1 ) Button/styles/disabled = SubResource( 2 ) Button/styles/focus = SubResource( 3 ) @@ -1531,7 +1531,7 @@ CheckBox/colors/font_color_pressed = Color( 0.00392157, 0.454902, 0.741176, 1 ) CheckBox/colors/icon_color_hover = Color( 1.15, 1.15, 1.15, 1 ) CheckBox/constants/check_vadjust = 0 CheckBox/constants/hseparation = 4 -CheckBox/fonts/font = null +CheckBox/fonts/font = ExtResource( 1 ) CheckBox/icons/checked = SubResource( 8 ) CheckBox/icons/radio_checked = SubResource( 10 ) CheckBox/icons/radio_unchecked = SubResource( 12 ) @@ -1573,7 +1573,7 @@ ColorPickerButton/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.3 ) ColorPickerButton/colors/font_color_hover = Color( 1, 1, 1, 1 ) ColorPickerButton/colors/font_color_pressed = Color( 0.8, 0.8, 0.8, 1 ) ColorPickerButton/constants/hseparation = 2 -ColorPickerButton/fonts/font = null +ColorPickerButton/fonts/font = ExtResource( 1 ) ColorPickerButton/icons/bg = SubResource( 29 ) ColorPickerButton/styles/disabled = null ColorPickerButton/styles/focus = null @@ -1656,14 +1656,13 @@ ItemList/constants/hseparation = 3 ItemList/constants/icon_margin = 4 ItemList/constants/line_separation = 3 ItemList/constants/vseparation = 3 -ItemList/fonts/font = null +ItemList/fonts/font = ExtResource( 1 ) ItemList/styles/bg = SubResource( 91 ) ItemList/styles/bg_focus = SubResource( 92 ) ItemList/styles/cursor = SubResource( 93 ) ItemList/styles/cursor_unfocused = SubResource( 93 ) ItemList/styles/selected = SubResource( 94 ) ItemList/styles/selected_focus = SubResource( 95 ) -"Label/colors/Selected Color" = Color( 0.235294, 0.364706, 0.458824, 1 ) Label/colors/font_color = Color( 0.848039, 0.848039, 0.848039, 1 ) Label/colors/font_color_shadow = Color( 0, 0, 0, 0 ) Label/colors/font_outline_modulate = Color( 1, 1, 1, 1 ) @@ -1671,7 +1670,7 @@ Label/constants/line_spacing = 3 Label/constants/shadow_as_outline = 0 Label/constants/shadow_offset_x = 1 Label/constants/shadow_offset_y = 1 -Label/fonts/font = null +Label/fonts/font = ExtResource( 1 ) Label/styles/normal = SubResource( 96 ) LineEdit/colors/clear_button_color = Color( 0.848039, 0.848039, 0.848039, 1 ) LineEdit/colors/clear_button_color_pressed = Color( 0.00392157, 0.454902, 0.741176, 1 ) @@ -1681,7 +1680,7 @@ LineEdit/colors/font_color_selected = Color( 1, 1, 1, 1 ) LineEdit/colors/read_only = Color( 1, 1, 1, 0.3 ) LineEdit/colors/selection_color = Color( 0.00392157, 0.454902, 0.741176, 0.4 ) LineEdit/constants/minimum_spaces = 12 -LineEdit/fonts/font = null +LineEdit/fonts/font = ExtResource( 1 ) LineEdit/icons/clear = SubResource( 98 ) LineEdit/styles/focus = SubResource( 3 ) LineEdit/styles/normal = SubResource( 5 ) @@ -1700,7 +1699,7 @@ MenuButton/colors/font_color_disabled = Color( 1, 1, 1, 0.3 ) MenuButton/colors/font_color_hover = Color( 0.908823, 0.908823, 0.908823, 1 ) MenuButton/colors/font_color_pressed = Color( 1, 1, 1, 1 ) MenuButton/constants/hseparation = 3 -MenuButton/fonts/font = null +MenuButton/fonts/font = ExtResource( 1 ) MenuButton/styles/disabled = SubResource( 23 ) MenuButton/styles/focus = SubResource( 23 ) MenuButton/styles/hover = SubResource( 23 ) @@ -1715,7 +1714,7 @@ OptionButton/colors/icon_color_hover = Color( 1.15, 1.15, 1.15, 1 ) OptionButton/constants/arrow_margin = 4 OptionButton/constants/hseparation = 4 OptionButton/constants/modulate_arrow = 1 -OptionButton/fonts/font = null +OptionButton/fonts/font = ExtResource( 1 ) OptionButton/icons/arrow = SubResource( 100 ) OptionButton/styles/disabled = SubResource( 2 ) OptionButton/styles/focus = SubResource( 3 ) @@ -1734,7 +1733,7 @@ PopupMenu/colors/font_color_disabled = Color( 1, 1, 1, 0.3 ) PopupMenu/colors/font_color_hover = Color( 0.908823, 0.908823, 0.908823, 1 ) PopupMenu/constants/hseparation = 4 PopupMenu/constants/vseparation = 5 -PopupMenu/fonts/font = null +PopupMenu/fonts/font = ExtResource( 1 ) PopupMenu/icons/checked = SubResource( 8 ) PopupMenu/icons/radio_checked = SubResource( 10 ) PopupMenu/icons/radio_unchecked = SubResource( 12 ) @@ -1774,7 +1773,7 @@ TabContainer/constants/label_valign_bg = 2 TabContainer/constants/label_valign_fg = 0 TabContainer/constants/side_margin = 0 TabContainer/constants/top_margin = 24 -TabContainer/fonts/font = null +TabContainer/fonts/font = ExtResource( 1 ) TabContainer/icons/decrement = SubResource( 126 ) TabContainer/icons/decrement_highlight = SubResource( 128 ) TabContainer/icons/increment = SubResource( 130 ) @@ -1792,7 +1791,7 @@ Tabs/constants/hseparation = 4 Tabs/constants/label_valign_bg = 2 Tabs/constants/label_valign_fg = 0 Tabs/constants/top_margin = 24 -Tabs/fonts/font = null +Tabs/fonts/font = ExtResource( 1 ) Tabs/icons/close = SubResource( 98 ) Tabs/icons/decrement = SubResource( 126 ) Tabs/icons/decrement_highlight = SubResource( 128 ) @@ -1831,7 +1830,7 @@ TextEdit/constants/completion_lines = 7 TextEdit/constants/completion_max_width = 50 TextEdit/constants/completion_scroll_width = 3 TextEdit/constants/line_spacing = 4 -TextEdit/fonts/font = null +TextEdit/fonts/font = ExtResource( 1 ) TextEdit/icons/fold = SubResource( 143 ) TextEdit/icons/folded = SubResource( 145 ) TextEdit/icons/space = SubResource( 147 ) @@ -1869,8 +1868,8 @@ Tree/constants/item_margin = 12 Tree/constants/scroll_border = 40 Tree/constants/scroll_speed = 12 Tree/constants/vseparation = 4 -Tree/fonts/font = null -Tree/fonts/title_button_font = null +Tree/fonts/font = ExtResource( 1 ) +Tree/fonts/title_button_font = ExtResource( 1 ) Tree/icons/arrow = SubResource( 143 ) Tree/icons/arrow_collapsed = SubResource( 145 ) Tree/icons/checked = SubResource( 8 ) @@ -1917,7 +1916,7 @@ WindowDialog/constants/close_h_ofs = 22 WindowDialog/constants/close_v_ofs = 20 WindowDialog/constants/scaleborder_size = 4 WindowDialog/constants/title_height = 24 -WindowDialog/fonts/title_font = null +WindowDialog/fonts/title_font = ExtResource( 1 ) WindowDialog/icons/close = SubResource( 98 ) WindowDialog/icons/close_highlight = SubResource( 98 ) WindowDialog/styles/panel = SubResource( 175 ) diff --git a/assets/themes/light/theme.tres b/assets/themes/light/theme.tres index 73259fd59..87bd97849 100644 --- a/assets/themes/light/theme.tres +++ b/assets/themes/light/theme.tres @@ -1516,7 +1516,7 @@ Button/colors/font_color_pressed = Color( 0, 0.356863, 1, 1 ) Button/colors/icon_color_hover = Color( 1.45, 1.45, 1.45, 1 ) Button/colors/icon_color_pressed = Color( 0, 1.24902, 3.5, 1 ) Button/constants/hseparation = 2 -Button/fonts/font = null +Button/fonts/font = ExtResource( 5 ) Button/styles/Ruler = SubResource( 1 ) Button/styles/disabled = SubResource( 2 ) Button/styles/focus = SubResource( 3 ) @@ -1531,7 +1531,7 @@ CheckBox/colors/font_color_pressed = Color( 0, 0.356863, 1, 1 ) CheckBox/colors/icon_color_hover = Color( 1.45, 1.45, 1.45, 1 ) CheckBox/constants/check_vadjust = 0 CheckBox/constants/hseparation = 4 -CheckBox/fonts/font = null +CheckBox/fonts/font = ExtResource( 5 ) CheckBox/icons/checked = SubResource( 8 ) CheckBox/icons/radio_checked = SubResource( 10 ) CheckBox/icons/radio_unchecked = SubResource( 12 ) @@ -1573,7 +1573,7 @@ ColorPickerButton/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.3 ) ColorPickerButton/colors/font_color_hover = Color( 1, 1, 1, 1 ) ColorPickerButton/colors/font_color_pressed = Color( 0.8, 0.8, 0.8, 1 ) ColorPickerButton/constants/hseparation = 2 -ColorPickerButton/fonts/font = null +ColorPickerButton/fonts/font = ExtResource( 5 ) ColorPickerButton/icons/bg = SubResource( 29 ) ColorPickerButton/styles/disabled = null ColorPickerButton/styles/focus = null @@ -1656,14 +1656,13 @@ ItemList/constants/hseparation = 3 ItemList/constants/icon_margin = 4 ItemList/constants/line_separation = 3 ItemList/constants/vseparation = 3 -ItemList/fonts/font = null +ItemList/fonts/font = ExtResource( 5 ) ItemList/styles/bg = SubResource( 91 ) ItemList/styles/bg_focus = SubResource( 92 ) ItemList/styles/cursor = SubResource( 93 ) ItemList/styles/cursor_unfocused = SubResource( 93 ) ItemList/styles/selected = SubResource( 94 ) ItemList/styles/selected_focus = SubResource( 95 ) -"Label/colors/Selected Color" = Color( 0.545098, 0.619608, 0.788235, 1 ) Label/colors/font_color = Color( 0.25, 0.25, 0.25, 1 ) Label/colors/font_color_shadow = Color( 0, 0, 0, 0 ) Label/colors/font_outline_modulate = Color( 0, 0, 0, 1 ) @@ -1671,7 +1670,7 @@ Label/constants/line_spacing = 3 Label/constants/shadow_as_outline = 0 Label/constants/shadow_offset_x = 1 Label/constants/shadow_offset_y = 1 -Label/fonts/font = null +Label/fonts/font = ExtResource( 5 ) Label/styles/normal = SubResource( 96 ) LineEdit/colors/clear_button_color = Color( 0.25, 0.25, 0.25, 1 ) LineEdit/colors/clear_button_color_pressed = Color( 0, 0.356863, 1, 1 ) @@ -1681,7 +1680,7 @@ LineEdit/colors/font_color_selected = Color( 0, 0, 0, 1 ) LineEdit/colors/read_only = Color( 0, 0, 0, 0.3 ) LineEdit/colors/selection_color = Color( 0, 0.356863, 1, 0.4 ) LineEdit/constants/minimum_spaces = 12 -LineEdit/fonts/font = null +LineEdit/fonts/font = ExtResource( 5 ) LineEdit/icons/clear = SubResource( 98 ) LineEdit/styles/focus = SubResource( 3 ) LineEdit/styles/normal = SubResource( 5 ) @@ -1700,7 +1699,7 @@ MenuButton/colors/font_color_disabled = Color( 1, 1, 1, 0.3 ) MenuButton/colors/font_color_hover = Color( 0.15, 0.15, 0.15, 1 ) MenuButton/colors/font_color_pressed = Color( 0, 0, 0, 1 ) MenuButton/constants/hseparation = 3 -MenuButton/fonts/font = null +MenuButton/fonts/font = ExtResource( 5 ) MenuButton/styles/disabled = SubResource( 23 ) MenuButton/styles/focus = SubResource( 23 ) MenuButton/styles/hover = SubResource( 23 ) @@ -1715,7 +1714,7 @@ OptionButton/colors/icon_color_hover = Color( 1.45, 1.45, 1.45, 1 ) OptionButton/constants/arrow_margin = 4 OptionButton/constants/hseparation = 4 OptionButton/constants/modulate_arrow = 1 -OptionButton/fonts/font = null +OptionButton/fonts/font = ExtResource( 5 ) OptionButton/icons/arrow = SubResource( 100 ) OptionButton/styles/disabled = SubResource( 2 ) OptionButton/styles/focus = SubResource( 3 ) @@ -1734,7 +1733,7 @@ PopupMenu/colors/font_color_disabled = Color( 0, 0, 0, 0.3 ) PopupMenu/colors/font_color_hover = Color( 0.15, 0.15, 0.15, 1 ) PopupMenu/constants/hseparation = 4 PopupMenu/constants/vseparation = 5 -PopupMenu/fonts/font = null +PopupMenu/fonts/font = ExtResource( 5 ) PopupMenu/icons/checked = SubResource( 8 ) PopupMenu/icons/radio_checked = SubResource( 10 ) PopupMenu/icons/radio_unchecked = SubResource( 12 ) @@ -1774,7 +1773,7 @@ TabContainer/constants/label_valign_bg = 2 TabContainer/constants/label_valign_fg = 0 TabContainer/constants/side_margin = 0 TabContainer/constants/top_margin = 24 -TabContainer/fonts/font = null +TabContainer/fonts/font = ExtResource( 5 ) TabContainer/icons/decrement = SubResource( 126 ) TabContainer/icons/decrement_highlight = SubResource( 128 ) TabContainer/icons/increment = SubResource( 130 ) @@ -1792,7 +1791,7 @@ Tabs/constants/hseparation = 4 Tabs/constants/label_valign_bg = 2 Tabs/constants/label_valign_fg = 0 Tabs/constants/top_margin = 24 -Tabs/fonts/font = null +Tabs/fonts/font = ExtResource( 5 ) Tabs/icons/close = SubResource( 98 ) Tabs/icons/decrement = SubResource( 126 ) Tabs/icons/decrement_highlight = SubResource( 128 ) @@ -1831,7 +1830,7 @@ TextEdit/constants/completion_lines = 7 TextEdit/constants/completion_max_width = 50 TextEdit/constants/completion_scroll_width = 3 TextEdit/constants/line_spacing = 4 -TextEdit/fonts/font = null +TextEdit/fonts/font = ExtResource( 5 ) TextEdit/icons/fold = SubResource( 143 ) TextEdit/icons/folded = SubResource( 145 ) TextEdit/icons/space = SubResource( 147 ) @@ -1845,7 +1844,7 @@ ToolButton/colors/font_color_disabled = Color( 0.9, 0.95, 1, 0.3 ) ToolButton/colors/font_color_hover = Color( 0.15, 0.15, 0.15, 1 ) ToolButton/colors/font_color_pressed = Color( 0, 0.356863, 1, 1 ) ToolButton/constants/hseparation = 3 -ToolButton/fonts/font = null +ToolButton/fonts/font = ExtResource( 5 ) ToolButton/styles/disabled = SubResource( 23 ) ToolButton/styles/focus = SubResource( 23 ) ToolButton/styles/hover = SubResource( 23 ) @@ -1872,8 +1871,8 @@ Tree/constants/item_margin = 12 Tree/constants/scroll_border = 40 Tree/constants/scroll_speed = 12 Tree/constants/vseparation = 4 -Tree/fonts/font = null -Tree/fonts/title_button_font = null +Tree/fonts/font = ExtResource( 5 ) +Tree/fonts/title_button_font = ExtResource( 5 ) Tree/icons/arrow = SubResource( 143 ) Tree/icons/arrow_collapsed = SubResource( 145 ) Tree/icons/checked = SubResource( 8 ) @@ -1920,7 +1919,7 @@ WindowDialog/constants/close_h_ofs = 22 WindowDialog/constants/close_v_ofs = 20 WindowDialog/constants/scaleborder_size = 4 WindowDialog/constants/title_height = 24 -WindowDialog/fonts/title_font = null +WindowDialog/fonts/title_font = ExtResource( 5 ) WindowDialog/icons/close = SubResource( 98 ) WindowDialog/icons/close_highlight = SubResource( 98 ) WindowDialog/styles/panel = SubResource( 175 ) diff --git a/assets/themes/purple/theme.tres b/assets/themes/purple/theme.tres index 22f8c3c18..d40b8c519 100644 --- a/assets/themes/purple/theme.tres +++ b/assets/themes/purple/theme.tres @@ -1587,7 +1587,6 @@ ItemList/styles/cursor = SubResource( 89 ) ItemList/styles/cursor_unfocused = SubResource( 89 ) ItemList/styles/selected = SubResource( 90 ) ItemList/styles/selected_focus = SubResource( 91 ) -"Label/colors/Selected Color" = Color( 0.662745, 0, 1, 1 ) Label/colors/font_color = Color( 0.79902, 0.780392, 0.820588, 1 ) Label/colors/font_color_shadow = Color( 0, 0, 0, 0 ) Label/constants/line_spacing = 3 @@ -1781,7 +1780,7 @@ WindowDialog/colors/title_color = Color( 0.79902, 0.780392, 0.820588, 1 ) WindowDialog/constants/close_h_ofs = 22 WindowDialog/constants/close_v_ofs = 20 WindowDialog/constants/title_height = 24 -WindowDialog/fonts/title_font = null +WindowDialog/fonts/title_font = ExtResource( 1 ) WindowDialog/icons/close = SubResource( 94 ) WindowDialog/icons/close_highlight = SubResource( 94 ) WindowDialog/styles/panel = SubResource( 170 ) diff --git a/src/Classes/Project.gd b/src/Classes/Project.gd index fe3cba35f..ac6231250 100644 --- a/src/Classes/Project.gd +++ b/src/Classes/Project.gd @@ -173,10 +173,6 @@ func change_project() -> void: button.frame = j button.rect_min_size.x = Global.animation_timeline.cel_size button.text = str(j + 1) - if j == current_frame: - button.add_color_override( - "font_color", Global.control.theme.get_color("Selected Color", "Label") - ) Global.frame_ids.add_child(button) var layer_button = Global.layers_container.get_child(