diff --git a/material_maker/nodes/edit_buttons.gd b/material_maker/nodes/edit_buttons.gd index 543204837..2706dd797 100644 --- a/material_maker/nodes/edit_buttons.gd +++ b/material_maker/nodes/edit_buttons.gd @@ -4,3 +4,10 @@ func connect_buttons(object, edit_fct, load_fct, save_fct) -> void: $Edit.connect("pressed", Callable(object, edit_fct)) $Load.connect("pressed", Callable(object, load_fct)) $Save.connect("pressed", Callable(object, save_fct)) + +func _on_ready() -> void: + # fix button icon colors (light theme) + for button in get_children(): + button.add_theme_color_override("icon_normal_color", Color.WHITE) + button.add_theme_color_override("icon_focus_color", Color("656565")) + button.add_theme_color_override("icon_pressed_color", Color("656565")) diff --git a/material_maker/nodes/edit_buttons.tscn b/material_maker/nodes/edit_buttons.tscn index d3f1c44b5..1720d2f55 100644 --- a/material_maker/nodes/edit_buttons.tscn +++ b/material_maker/nodes/edit_buttons.tscn @@ -1,20 +1,21 @@ [gd_scene load_steps=6 format=3 uid="uid://cit68cso5187c"] -[ext_resource type="Script" path="res://material_maker/nodes/edit_buttons.gd" id="1"] -[ext_resource type="Texture2D" uid="uid://c0j4px4n72di5" path="res://material_maker/icons/icons.tres" id="2"] +[ext_resource type="Script" uid="uid://ruo1gfek58tl" path="res://material_maker/nodes/edit_buttons.gd" id="1"] +[ext_resource type="Texture2D" uid="uid://cvorvnes6fiq7" path="res://material_maker/icons/icons.svg" id="2_dvsrk"] [sub_resource type="AtlasTexture" id="1"] -atlas = ExtResource("2") +atlas = ExtResource("2_dvsrk") region = Rect2(16, 16, 16, 16) filter_clip = true [sub_resource type="AtlasTexture" id="2"] -atlas = ExtResource("2") +atlas = ExtResource("2_dvsrk") region = Rect2(48, 16, 16, 16) [sub_resource type="AtlasTexture" id="3"] -atlas = ExtResource("2") +atlas = ExtResource("2_dvsrk") region = Rect2(32, 16, 16, 16) +metadata/Recolor = false [node name="NodeEditButtons" type="HBoxContainer"] offset_right = 65.0 @@ -35,3 +36,6 @@ flat = true layout_mode = 2 icon = SubResource("3") flat = true + +[connection signal="ready" from="." to="." method="_on_ready"] +[connection signal="ready" from="Edit" to="." method="_on_edit_ready"] diff --git a/material_maker/theme/classic.tres b/material_maker/theme/classic.tres index 45b4a820e..db6c6efa9 100644 --- a/material_maker/theme/classic.tres +++ b/material_maker/theme/classic.tres @@ -1,6 +1,6 @@ -[gd_resource type="Theme" load_steps=116 format=3 uid="uid://42cileyfwaca"] +[gd_resource type="Theme" load_steps=117 format=3 uid="uid://42cileyfwaca"] -[ext_resource type="Texture2D" uid="uid://c7mq31csbj1fg" path="res://material_maker/theme/default_theme_icons.svg" id="1_7p32q"] +[ext_resource type="Texture2D" uid="uid://1s0c37uoj4rf" path="res://material_maker/theme/default_theme_icons.svg" id="1_7p32q"] [ext_resource type="FontFile" uid="uid://dgkwr5jydtk6p" path="res://material_maker/theme/font_rubik/Rubik-VariableFont_wght.ttf" id="1_l05jd"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_inl5r"] @@ -84,6 +84,9 @@ region = Rect2(64, 112, 16, 16) atlas = ExtResource("1_7p32q") region = Rect2(96, 112, 16, 16) +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_meah8"] +bg_color = Color(0.14902, 0.172549, 0.231373, 1) + [sub_resource type="AtlasTexture" id="AtlasTexture_m1w7u"] atlas = ExtResource("1_7p32q") region = Rect2(0, 128, 16, 16) @@ -775,6 +778,21 @@ CheckBox/icons/radio_unchecked = SubResource("AtlasTexture_rdh87") CheckBox/icons/radio_unchecked_disabled = SubResource("AtlasTexture_8fbk7") CheckBox/icons/unchecked = SubResource("AtlasTexture_5s2d2") CheckBox/icons/unchecked_disabled = SubResource("AtlasTexture_vngdy") +CodeEdit/colors/built_in_function_color = Color(0.278431, 0.54902, 0.705882, 1) +CodeEdit/colors/caret_color = Color(0.87451, 0.87451, 0.87451, 1) +CodeEdit/colors/current_line_color = Color(0.25, 0.25, 0.26, 0.8) +CodeEdit/colors/font_color = Color(0.875, 0.875, 0.875, 1) +CodeEdit/colors/function_color = Color(0.278431, 0.54902, 0.705882, 1) +CodeEdit/colors/keyword_color = Color(1, 0.576471, 0.592157, 1) +CodeEdit/colors/line_number_color = Color(0.67, 0.67, 0.67, 0.4) +CodeEdit/colors/member_variable_color = Color(0.945098, 0.231373, 0.317647, 1) +CodeEdit/colors/multi_line_comment_color = Color(0, 0.509804, 0, 1) +CodeEdit/colors/number_color = Color(0.905882, 0.521569, 0.0313726, 1) +CodeEdit/colors/selection_color = Color(0.501961, 0.501961, 0.501961, 1) +CodeEdit/colors/single_line_comment_color = Color(0, 0.509804, 0, 1) +CodeEdit/colors/symbol_color = Color(1, 1, 1, 1) +CodeEdit/colors/type_color = Color(1, 1, 0.878431, 1) +CodeEdit/styles/normal = SubResource("StyleBoxFlat_meah8") GraphEdit/colors/grid_major = Color(0.321569, 0.337255, 0.384314, 1) GraphEdit/colors/grid_minor = Color(0.321569, 0.337255, 0.384314, 1) GraphEdit/constants/port_hotzone_inner_extent = 8 diff --git a/material_maker/theme/default dark.tres b/material_maker/theme/default dark.tres index 759705d0a..3540375d0 100644 --- a/material_maker/theme/default dark.tres +++ b/material_maker/theme/default dark.tres @@ -1,4 +1,4 @@ -[gd_resource type="Theme" script_class="EnhancedTheme" load_steps=34 format=3 uid="uid://dhuhq2immquoh"] +[gd_resource type="Theme" script_class="EnhancedTheme" load_steps=37 format=3 uid="uid://dhuhq2immquoh"] [ext_resource type="Theme" uid="uid://b628lwfk6ig2c" path="res://material_maker/theme/default.tres" id="3_xjelh"] [ext_resource type="Script" uid="uid://3ga2k3abkk0d" path="res://material_maker/theme/enhanced_theme_system/color_swap.gd" id="4_0efyb"] @@ -184,9 +184,30 @@ name = "FloatFillHover" orig = Color(0.356863, 0.356863, 0.356863, 1) target = Color(0.356863, 0.356863, 0.356863, 1) +[sub_resource type="Resource" id="Resource_430ei"] +script = ExtResource("4_0efyb") +name = "RichTextLabel" +orig = Color(0, 0, 0, 1) +target = Color(0, 0, 0, 1) +metadata/_custom_type_script = "uid://3ga2k3abkk0d" + +[sub_resource type="Resource" id="Resource_svk4l"] +script = ExtResource("4_0efyb") +name = "OptionEditButtonPopup" +orig = Color(0.207843, 0.215686, 0.235294, 1) +target = Color(0.207843, 0.215686, 0.235294, 1) +metadata/_custom_type_script = "uid://3ga2k3abkk0d" + +[sub_resource type="Resource" id="Resource_i62a2"] +script = ExtResource("4_0efyb") +name = "AddNodePopupList" +orig = Color(0.0980392, 0.0980392, 0.101961, 1) +target = Color(0.0980392, 0.0980392, 0.101961, 1) +metadata/_custom_type_script = "uid://3ga2k3abkk0d" + [resource] script = ExtResource("5_yjidp") base_theme = ExtResource("3_xjelh") font_color_swaps = Array[ExtResource("4_0efyb")]([SubResource("Resource_silay"), SubResource("Resource_eavso"), SubResource("Resource_1jhxl"), SubResource("Resource_qiwix"), SubResource("Resource_5yhcl"), SubResource("Resource_vdnfu"), SubResource("Resource_21aar"), SubResource("Resource_us4qf")]) icon_color_swaps = Array[ExtResource("4_0efyb")]([SubResource("Resource_cisvi"), SubResource("Resource_j2h7k"), SubResource("Resource_8dhbo"), SubResource("Resource_5oh4i")]) -theme_color_swaps = Array[ExtResource("4_0efyb")]([SubResource("Resource_ub5ur"), SubResource("Resource_5rv7m"), SubResource("Resource_xqbwo"), SubResource("Resource_a2t6i"), SubResource("Resource_pekt7"), SubResource("Resource_vbpcr"), SubResource("Resource_qngft"), SubResource("Resource_5mixu"), SubResource("Resource_kxmra"), SubResource("Resource_siafh"), SubResource("Resource_s732t"), SubResource("Resource_j1t84"), SubResource("Resource_g7e3b"), SubResource("Resource_oirgf"), SubResource("Resource_1pump"), SubResource("Resource_fxm05"), SubResource("Resource_mfxjg"), SubResource("Resource_upxps")]) +theme_color_swaps = Array[ExtResource("4_0efyb")]([SubResource("Resource_ub5ur"), SubResource("Resource_5rv7m"), SubResource("Resource_xqbwo"), SubResource("Resource_a2t6i"), SubResource("Resource_pekt7"), SubResource("Resource_vbpcr"), SubResource("Resource_qngft"), SubResource("Resource_5mixu"), SubResource("Resource_kxmra"), SubResource("Resource_siafh"), SubResource("Resource_s732t"), SubResource("Resource_j1t84"), SubResource("Resource_g7e3b"), SubResource("Resource_oirgf"), SubResource("Resource_1pump"), SubResource("Resource_fxm05"), SubResource("Resource_mfxjg"), SubResource("Resource_upxps"), SubResource("Resource_430ei"), SubResource("Resource_svk4l"), SubResource("Resource_i62a2")]) diff --git a/material_maker/theme/default light.tres b/material_maker/theme/default light.tres index d7645639d..9c532be69 100644 --- a/material_maker/theme/default light.tres +++ b/material_maker/theme/default light.tres @@ -1,4 +1,4 @@ -[gd_resource type="Theme" script_class="EnhancedTheme" load_steps=36 format=3 uid="uid://u00kx2lkkx8j"] +[gd_resource type="Theme" script_class="EnhancedTheme" load_steps=54 format=3 uid="uid://u00kx2lkkx8j"] [ext_resource type="Theme" uid="uid://b628lwfk6ig2c" path="res://material_maker/theme/default.tres" id="1_ugsao"] [ext_resource type="Script" uid="uid://3ga2k3abkk0d" path="res://material_maker/theme/enhanced_theme_system/color_swap.gd" id="4_rhf2q"] @@ -59,6 +59,13 @@ orig = Color(0.556863, 0.556863, 0.556863, 1) target = Color(0.29219, 0.29219, 0.29219, 1) metadata/_custom_type_script = ExtResource("4_rhf2q") +[sub_resource type="Resource" id="Resource_mhcke"] +script = ExtResource("4_rhf2q") +name = "CodeEdit" +orig = Color(0.87451, 0.87451, 0.87451, 1) +target = Color(0.2, 0.2, 0.2, 1) +metadata/_custom_type_script = "uid://3ga2k3abkk0d" + [sub_resource type="Resource" id="Resource_cisvi"] script = ExtResource("4_rhf2q") name = "Main" @@ -193,14 +200,133 @@ target = Color(0.912935, 0.916904, 0.924811, 1) [sub_resource type="Resource" id="Resource_lk0mo"] script = ExtResource("4_rhf2q") -name = "Default Color" +name = "RichTextLabel" orig = Color(1, 1, 1, 1) target = Color(0, 0, 0, 1) metadata/_custom_type_script = "uid://3ga2k3abkk0d" +[sub_resource type="Resource" id="Resource_sgt8g"] +script = ExtResource("4_rhf2q") +name = "OptionEditButtonPopup" +orig = Color(0.207843, 0.215686, 0.235294, 1) +target = Color(0.82, 0.82, 0.82, 1) +metadata/_custom_type_script = "uid://3ga2k3abkk0d" + +[sub_resource type="Resource" id="Resource_p6yfp"] +script = ExtResource("4_rhf2q") +name = "AddNodePopupList" +orig = Color(0.0980392, 0.0980392, 0.101961, 1) +target = Color(0.821789, 0.821789, 0.821789, 1) +metadata/_custom_type_script = "uid://3ga2k3abkk0d" + +[sub_resource type="Resource" id="Resource_mntha"] +script = ExtResource("4_rhf2q") +name = "CodeEditType" +orig = Color(1, 1, 0.501961, 1) +target = Color(0.547832, 0.455813, 5.8776e-07, 1) +metadata/_custom_type_script = "uid://3ga2k3abkk0d" + +[sub_resource type="Resource" id="Resource_5l403"] +script = ExtResource("4_rhf2q") +name = "CodeEditSymbol" +orig = Color(1, 1, 0.501961, 1) +target = Color(0.55, 0.484917, 0.1595, 1) +metadata/_custom_type_script = "uid://3ga2k3abkk0d" + +[sub_resource type="Resource" id="Resource_qx1ic"] +script = ExtResource("4_rhf2q") +name = "CodeEditLineNumber" +orig = Color(0.670588, 0.670588, 0.670588, 0.4) +target = Color(0.3, 0.3, 0.3, 0.4) +metadata/_custom_type_script = "uid://3ga2k3abkk0d" + +[sub_resource type="Resource" id="Resource_skxhu"] +script = ExtResource("4_rhf2q") +name = "CodeEditSelection" +orig = Color(0.501961, 0.501961, 0.501961, 1) +target = Color(0.621524, 0.621524, 0.621524, 1) +metadata/_custom_type_script = "uid://3ga2k3abkk0d" + +[sub_resource type="Resource" id="Resource_gf74u"] +script = ExtResource("4_rhf2q") +name = "CodeEditCurrentLine" +orig = Color(0.25098, 0.25098, 0.258824, 0.8) +target = Color(0.5, 0.5, 0.5, 0.392157) +metadata/_custom_type_script = "uid://3ga2k3abkk0d" + +[sub_resource type="Resource" id="Resource_6iwcg"] +script = ExtResource("4_rhf2q") +name = "CodeEditCaret" +orig = Color(0.87451, 0.87451, 0.87451, 1) +target = Color(0.0827415, 0.0827414, 0.0827414, 1) +metadata/_custom_type_script = "uid://3ga2k3abkk0d" + +[sub_resource type="Resource" id="Resource_emwrq"] +script = ExtResource("4_rhf2q") +name = "CodeEditKeyword" +orig = Color(1, 0.6, 0.6, 1) +target = Color(0.617188, 0.366455, 0.366455, 1) +metadata/_custom_type_script = "uid://3ga2k3abkk0d" + +[sub_resource type="Resource" id="Resource_g0345"] +script = ExtResource("4_rhf2q") +name = "SingleLineComment" +orig = Color(0, 0.501961, 0, 1) +target = Color(0, 0.33, 0, 1) +metadata/_custom_type_script = "uid://3ga2k3abkk0d" + +[sub_resource type="Resource" id="Resource_mqr67"] +script = ExtResource("4_rhf2q") +name = "MultiLineComment" +orig = Color(0, 0.501961, 0, 1) +target = Color(0, 0.329412, 0, 1) +metadata/_custom_type_script = "uid://3ga2k3abkk0d" + +[sub_resource type="Resource" id="Resource_enwto"] +script = ExtResource("4_rhf2q") +name = "CodeEditFunction" +orig = Color(0.780392, 0.00784314, 0.776471, 1) +target = Color(0.55, 0.099, 0.55, 1) +metadata/_custom_type_script = "uid://3ga2k3abkk0d" + +[sub_resource type="Resource" id="Resource_t0kvp"] +script = ExtResource("4_rhf2q") +name = "CodeEditNumber" +orig = Color(0.341176, 0.34902, 0.992157, 1) +target = Color(0.2624, 0.268693, 0.64, 1) +metadata/_custom_type_script = "uid://3ga2k3abkk0d" + +[sub_resource type="Resource" id="Resource_tw3yc"] +script = ExtResource("4_rhf2q") +name = "CodeEditMemberVariable" +orig = Color(0.870588, 0.298039, 0.337255, 1) +target = Color(0.6, 0.174, 0.2024, 1) +metadata/_custom_type_script = "uid://3ga2k3abkk0d" + +[sub_resource type="Resource" id="Resource_5w06f"] +script = ExtResource("4_rhf2q") +name = "CodeEditNormal" +orig = Color(0.0980392, 0.0980392, 0.101961, 1) +target = Color(0.804688, 0.804688, 0.804688, 1) +metadata/_custom_type_script = "uid://3ga2k3abkk0d" + +[sub_resource type="Resource" id="Resource_m8hbw"] +script = ExtResource("4_rhf2q") +name = "CodeEditBuiltInFunction" +orig = Color(0.501961, 0.501961, 1, 1) +target = Color(0.27451, 0.27451, 0.690196, 1) +metadata/_custom_type_script = "uid://3ga2k3abkk0d" + +[sub_resource type="Resource" id="Resource_xnhnj"] +script = ExtResource("4_rhf2q") +name = "FileDiaglogFileDisabled" +orig = Color(0.301961, 0.305882, 0.309804, 1) +target = Color(0.2134, 0.2167, 0.22, 0.470588) +metadata/_custom_type_script = "uid://3ga2k3abkk0d" + [resource] script = ExtResource("5_fagh3") base_theme = ExtResource("1_ugsao") -font_color_swaps = Array[ExtResource("4_rhf2q")]([SubResource("Resource_silay"), SubResource("Resource_eavso"), SubResource("Resource_1jhxl"), SubResource("Resource_qiwix"), SubResource("Resource_5yhcl"), SubResource("Resource_vdnfu"), SubResource("Resource_21aar"), SubResource("Resource_us4qf"), SubResource("Resource_3wcad")]) +font_color_swaps = Array[ExtResource("4_rhf2q")]([SubResource("Resource_silay"), SubResource("Resource_eavso"), SubResource("Resource_1jhxl"), SubResource("Resource_qiwix"), SubResource("Resource_5yhcl"), SubResource("Resource_vdnfu"), SubResource("Resource_21aar"), SubResource("Resource_us4qf"), SubResource("Resource_3wcad"), SubResource("Resource_mhcke")]) icon_color_swaps = Array[ExtResource("4_rhf2q")]([SubResource("Resource_cisvi"), SubResource("Resource_j2h7k"), SubResource("Resource_8dhbo"), SubResource("Resource_5oh4i")]) -theme_color_swaps = Array[ExtResource("4_rhf2q")]([SubResource("Resource_ub5ur"), SubResource("Resource_5rv7m"), SubResource("Resource_xqbwo"), SubResource("Resource_a2t6i"), SubResource("Resource_pekt7"), SubResource("Resource_vbpcr"), SubResource("Resource_qngft"), SubResource("Resource_5mixu"), SubResource("Resource_kxmra"), SubResource("Resource_siafh"), SubResource("Resource_s732t"), SubResource("Resource_j1t84"), SubResource("Resource_g7e3b"), SubResource("Resource_oirgf"), SubResource("Resource_1pump"), SubResource("Resource_fxm05"), SubResource("Resource_mfxjg"), SubResource("Resource_upxps"), SubResource("Resource_upxps"), SubResource("Resource_lk0mo")]) +theme_color_swaps = Array[ExtResource("4_rhf2q")]([SubResource("Resource_ub5ur"), SubResource("Resource_5rv7m"), SubResource("Resource_xqbwo"), SubResource("Resource_a2t6i"), SubResource("Resource_pekt7"), SubResource("Resource_vbpcr"), SubResource("Resource_qngft"), SubResource("Resource_5mixu"), SubResource("Resource_kxmra"), SubResource("Resource_siafh"), SubResource("Resource_s732t"), SubResource("Resource_j1t84"), SubResource("Resource_g7e3b"), SubResource("Resource_oirgf"), SubResource("Resource_1pump"), SubResource("Resource_fxm05"), SubResource("Resource_mfxjg"), SubResource("Resource_upxps"), SubResource("Resource_upxps"), SubResource("Resource_lk0mo"), SubResource("Resource_sgt8g"), SubResource("Resource_p6yfp"), SubResource("Resource_mntha"), SubResource("Resource_5l403"), SubResource("Resource_qx1ic"), SubResource("Resource_skxhu"), SubResource("Resource_gf74u"), SubResource("Resource_6iwcg"), SubResource("Resource_emwrq"), SubResource("Resource_g0345"), SubResource("Resource_mqr67"), SubResource("Resource_enwto"), SubResource("Resource_t0kvp"), SubResource("Resource_tw3yc"), SubResource("Resource_5w06f"), SubResource("Resource_m8hbw"), SubResource("Resource_xnhnj")]) diff --git a/material_maker/theme/default.tres b/material_maker/theme/default.tres index 9134e0ef3..534bb7a89 100644 --- a/material_maker/theme/default.tres +++ b/material_maker/theme/default.tres @@ -99,6 +99,9 @@ atlas = ExtResource("1_s43fy") region = Rect2(96, 112, 16, 16) metadata/recolor = false +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_oy0ko"] +bg_color = Color(0.0980392, 0.0980392, 0.101961, 1) + [sub_resource type="AtlasTexture" id="AtlasTexture_m1w7u"] atlas = ExtResource("1_s43fy") region = Rect2(0, 128, 16, 16) @@ -270,6 +273,9 @@ border_width_right = 1 border_width_bottom = 1 border_color = Color(0.359069, 0.359069, 0.359069, 1) +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_agwde"] +bg_color = Color(0.0980392, 0.0980392, 0.101961, 1) + [sub_resource type="AtlasTexture" id="AtlasTexture_08mel"] atlas = ExtResource("1_s43fy") region = Rect2(32, 176, 16, 16) @@ -1009,6 +1015,24 @@ CheckBox/icons/radio_unchecked = SubResource("AtlasTexture_rdh87") CheckBox/icons/radio_unchecked_disabled = SubResource("AtlasTexture_8fbk7") CheckBox/icons/unchecked = SubResource("AtlasTexture_5s2d2") CheckBox/icons/unchecked_disabled = SubResource("AtlasTexture_vngdy") +CodeEdit/colors/built_in_function_color = Color(0.501961, 0.501961, 1, 1) +CodeEdit/colors/caret_color = Color(0.875, 0.875, 0.875, 1) +CodeEdit/colors/current_line_color = Color(0.25, 0.25, 0.26, 0.8) +CodeEdit/colors/font_color = Color(0.875, 0.875, 0.875, 1) +CodeEdit/colors/function_color = Color(0.780392, 0.00784314, 0.776471, 1) +CodeEdit/colors/keyword_color = Color(1, 0.6, 0.6, 1) +CodeEdit/colors/line_number_color = Color(0.67, 0.67, 0.67, 0.4) +CodeEdit/colors/member_variable_color = Color(0.870588, 0.298039, 0.337255, 1) +CodeEdit/colors/multi_line_comment_color = Color(0, 0.5, 0, 1) +CodeEdit/colors/number_color = Color(0.341176, 0.34902, 0.992157, 1) +CodeEdit/colors/selection_color = Color(0.5, 0.5, 0.5, 1) +CodeEdit/colors/single_line_comment_color = Color(0, 0.5, 0, 1) +CodeEdit/colors/symbol_color = Color(1, 1, 0.501961, 1) +CodeEdit/colors/type_color = Color(1, 1, 0.5, 1) +CodeEdit/styles/normal = SubResource("StyleBoxFlat_oy0ko") +FileDialog/colors/file_disabled_color = Color(0.301961, 0.305882, 0.309804, 1) +FileDialog/colors/file_icon_color = Color(0.698039, 0.698039, 0.698039, 1) +FileDialog/colors/folder_icon_color = Color(0.698039, 0.698039, 0.698039, 1) GraphEdit/colors/grid_major = Color(0.137255, 0.141176, 0.152941, 1) GraphEdit/colors/grid_minor = Color(0.137255, 0.141176, 0.152941, 1) GraphEdit/constants/port_hotzone_inner_extent = 8 @@ -1050,6 +1074,7 @@ LineEdit/styles/read_only = SubResource("StyleBoxFlat_k7e83") MM_AddNodePanel/base_type = &"PanelContainer" MM_AddNodePanel/styles/panel = SubResource("StyleBoxFlat_f0kci") MM_AddNodePanelList/base_type = &"ItemList" +MM_AddNodePanelList/styles/panel = SubResource("StyleBoxFlat_agwde") MM_CommentNode/icons/resizer = SubResource("AtlasTexture_08mel") MM_CommentNode/styles/default = SubResource("StyleBoxFlat_asgc8") MM_CommentNode/styles/selected = SubResource("StyleBoxFlat_en6gw") diff --git a/material_maker/widgets/code_editor/code_editor.gd b/material_maker/widgets/code_editor/code_editor.gd index a421c7749..66b5e0793 100644 --- a/material_maker/widgets/code_editor/code_editor.gd +++ b/material_maker/widgets/code_editor/code_editor.gd @@ -30,13 +30,17 @@ func _context_menu_about_to_popup() -> void: func _ready(): get_menu().about_to_popup.connect(_context_menu_about_to_popup) for t in KEYWORDS: - syntax_highlighter.add_keyword_color(t, Color(1.0, 0.6, 0.6)) + syntax_highlighter.add_keyword_color(t, get_theme_color("keyword_color", "CodeEdit")) for t in TYPES: - syntax_highlighter.add_keyword_color(t, Color(1.0, 1.0, 0.5)) + syntax_highlighter.add_keyword_color(t, get_theme_color("type_color", "CodeEdit")) for t in FUNCTIONS: - syntax_highlighter.add_keyword_color(t, Color(0.5, 0.5, 1.0)) - syntax_highlighter.add_color_region("//", "", Color(0.0, 0.5, 0.0), true) - syntax_highlighter.add_color_region("/*", "*/", Color(0.0, 0.5, 0.0), false) + syntax_highlighter.add_keyword_color(t, get_theme_color("built_in_function_color", "CodeEdit")) + syntax_highlighter.symbol_color = get_theme_color("symbol_color", "CodeEdit") + syntax_highlighter.number_color = get_theme_color("number_color", "CodeEdit") + syntax_highlighter.function_color = get_theme_color("function_color", "CodeEdit") + syntax_highlighter.member_variable_color = get_theme_color("member_variable_color", "CodeEdit") + syntax_highlighter.add_color_region("//", "", get_theme_color("single_line_comment_color", "CodeEdit"), true) + syntax_highlighter.add_color_region("/*", "*/", get_theme_color("multi_line_comment_color", "CodeEdit"), false) func _on_gui_input(event): if event is InputEventKey: @@ -149,3 +153,8 @@ func _on_replace_all_pressed(): p.x += replace_string.length() end_complex_operation() update_find_occurrences() + +func _notification(what: int) -> void: + match what: + NOTIFICATION_THEME_CHANGED: + _ready() diff --git a/material_maker/windows/material_editor/export_editor.gd b/material_maker/windows/material_editor/export_editor.gd index e93b3f6bf..c50b59c64 100644 --- a/material_maker/windows/material_editor/export_editor.gd +++ b/material_maker/windows/material_editor/export_editor.gd @@ -43,6 +43,12 @@ func _ready(): for context_menu in context_menus: context_menu.about_to_popup.connect( _context_menu_about_to_popup.bind(context_menu)) + # fix button icon colors (light theme) + for button in $MarginContainer/VBoxContainer/Export.get_children(): + if button is Button: + button.add_theme_color_override("icon_normal_color", Color.WHITE) + button.add_theme_color_override("icon_focus_color", Color("656565")) + button.add_theme_color_override("icon_pressed_color", Color("656565")) func update_export_list() -> void: export_target.clear() diff --git a/material_maker/windows/material_editor/export_editor.tscn b/material_maker/windows/material_editor/export_editor.tscn index f61a324d5..3e64a75b8 100644 --- a/material_maker/windows/material_editor/export_editor.tscn +++ b/material_maker/windows/material_editor/export_editor.tscn @@ -1,35 +1,35 @@ [gd_scene load_steps=11 format=3 uid="uid://cwjtvrgb2al2x"] -[ext_resource type="Texture2D" uid="uid://c0j4px4n72di5" path="res://material_maker/icons/icons.tres" id="1"] [ext_resource type="Script" uid="uid://bp8x8ej3d6k4e" path="res://material_maker/windows/material_editor/export_editor.gd" id="2"] [ext_resource type="PackedScene" uid="uid://lt2wnsnw4af6" path="res://material_maker/windows/material_editor/expression_line_edit.tscn" id="3"] +[ext_resource type="Texture2D" uid="uid://cvorvnes6fiq7" path="res://material_maker/icons/icons.svg" id="3_ko8a7"] [sub_resource type="AtlasTexture" id="2"] -atlas = ExtResource("1") +atlas = ExtResource("3_ko8a7") region = Rect2(48, 0, 16, 16) [sub_resource type="AtlasTexture" id="9"] -atlas = ExtResource("1") +atlas = ExtResource("3_ko8a7") region = Rect2(48, 16, 16, 16) [sub_resource type="AtlasTexture" id="3"] -atlas = ExtResource("1") +atlas = ExtResource("3_ko8a7") region = Rect2(16, 16, 16, 16) [sub_resource type="AtlasTexture" id="7"] -atlas = ExtResource("1") +atlas = ExtResource("3_ko8a7") region = Rect2(48, 64, 16, 16) [sub_resource type="AtlasTexture" id="8"] -atlas = ExtResource("1") +atlas = ExtResource("3_ko8a7") region = Rect2(32, 16, 16, 16) [sub_resource type="AtlasTexture" id="4"] -atlas = ExtResource("1") +atlas = ExtResource("3_ko8a7") region = Rect2(48, 160, 16, 16) [sub_resource type="AtlasTexture" id="5"] -atlas = ExtResource("1") +atlas = ExtResource("3_ko8a7") region = Rect2(32, 0, 16, 16) [node name="ExportEditor" type="Window"]