From b62fe72d4148afcef673393667e4b0c7ff3fa4c5 Mon Sep 17 00:00:00 2001 From: Kasper Frandsen Date: Fri, 21 Oct 2022 15:46:43 +0100 Subject: [PATCH] feat: inial update to dark theme --- .../panels/hierarchy/hierarchy_panel.gd | 8 +- material_maker/panels/library/library.tscn | 14 +- material_maker/theme/dark.tres | 346 +++++++++++++----- material_maker/theme/default.tres | 12 +- .../color_picker_popup.tscn | 7 +- .../widgets/graph_tree/graph_tree.tscn | 3 +- .../windows/add_node_popup/add_node_popup.gd | 3 +- .../add_node_popup/add_node_popup.tscn | 6 +- .../add_node_popup/node_selection_button.gd | 5 + .../add_node_popup/node_selection_button.tscn | 3 - .../windows/file_dialog/fav_button.tscn | 3 - .../windows/node_editor/node_editor.tscn | 14 +- .../windows/preferences/preferences.tscn | 22 +- 13 files changed, 306 insertions(+), 140 deletions(-) diff --git a/material_maker/panels/hierarchy/hierarchy_panel.gd b/material_maker/panels/hierarchy/hierarchy_panel.gd index a1c1a926b..5ed9c9bd6 100644 --- a/material_maker/panels/hierarchy/hierarchy_panel.gd +++ b/material_maker/panels/hierarchy/hierarchy_panel.gd @@ -80,9 +80,9 @@ func set_icon(item : TreeItem, generator : MMGenGraph, output : int) -> void: func fill_item(item : TreeItem, generator : MMGenGraph, selected : MMGenGraph, name = null) -> void: item.set_text(0, name if name != null else generator.get_type_name()) if generator == selected: - item.set_custom_color(0, Color(0.5, 0.5, 1)) + item.set_suffix(0, " <") else: - item.clear_custom_color(0) + item.set_suffix(0, "") item.set_metadata(0, generator) item_from_gen[generator] = item generator.connect("parameter_changed", self, "on_gen_parameter_changed", [ generator ]) @@ -105,10 +105,10 @@ func _on_Hierarchy_item_double_clicked() -> void: func on_view_updated(generator) -> void: assert(generator is MMGenGraph) if item_from_gen.has(current_generator): - item_from_gen[current_generator].clear_custom_color(0) + item_from_gen[current_generator].set_suffix(0, "") current_generator = generator if item_from_gen.has(current_generator): - item_from_gen[current_generator].set_custom_color(0, Color(0.5, 0.5, 1)) + item_from_gen[current_generator].set_suffix(0, " <") func on_gen_parameter_changed(param_name : String, _value, generator) -> void: if param_name == "__output_changed__": diff --git a/material_maker/panels/library/library.tscn b/material_maker/panels/library/library.tscn index 17316853b..7e1c87ad1 100644 --- a/material_maker/panels/library/library.tscn +++ b/material_maker/panels/library/library.tscn @@ -9,9 +9,7 @@ flags = 4 atlas = ExtResource( 3 ) region = Rect2( 0, 0, 16, 16 ) -[node name="Library" type="VBoxContainer" groups=[ -"updated_from_locale", -]] +[node name="Library" type="VBoxContainer" groups=["updated_from_locale"]] anchor_right = 1.0 anchor_bottom = 1.0 rect_min_size = Vector2( 200, 200 ) @@ -42,24 +40,24 @@ columns = 5 [node name="Filter" type="HBoxContainer" parent="."] margin_top = 30.0 margin_right = 1280.0 -margin_bottom = 54.0 +margin_bottom = 56.0 size_flags_horizontal = 3 [node name="FilterLabel" type="Label" parent="Filter"] -margin_top = 5.0 +margin_top = 6.0 margin_right = 37.0 -margin_bottom = 19.0 +margin_bottom = 20.0 text = "Filter:" [node name="Filter" type="LineEdit" parent="Filter"] margin_left = 41.0 margin_right = 1280.0 -margin_bottom = 24.0 +margin_bottom = 26.0 size_flags_horizontal = 3 clear_button_enabled = true [node name="Tree" type="Tree" parent="."] -margin_top = 58.0 +margin_top = 60.0 margin_right = 1280.0 margin_bottom = 720.0 rect_min_size = Vector2( 100, 100 ) diff --git a/material_maker/theme/dark.tres b/material_maker/theme/dark.tres index 60922a1a1..b6a7672c4 100644 --- a/material_maker/theme/dark.tres +++ b/material_maker/theme/dark.tres @@ -1,4 +1,4 @@ -[gd_resource type="Theme" load_steps=125 format=2] +[gd_resource type="Theme" load_steps=139 format=2] [ext_resource path="res://material_maker/theme/dark/textedit_fold.png" type="Texture" id=1] [ext_resource path="res://material_maker/theme/dark/textedit_space.png" type="Texture" id=2] @@ -65,60 +65,60 @@ content_margin_left = 6.0 content_margin_right = 6.0 content_margin_top = 4.0 content_margin_bottom = 4.0 -bg_color = Color( 0.134118, 0.134118, 0.134118, 1 ) +bg_color = Color( 0.172549, 0.172549, 0.172549, 1 ) border_width_left = 1 border_width_top = 1 border_width_right = 1 border_width_bottom = 1 border_color = Color( 0.104314, 0.104314, 0.104314, 1 ) -[sub_resource type="StyleBoxFlat" id=59] +[sub_resource type="StyleBoxFlat" id=130] content_margin_left = 6.0 content_margin_right = 6.0 content_margin_top = 4.0 content_margin_bottom = 4.0 -bg_color = Color( 0.111765, 0.111765, 0.111765, 1 ) -border_width_left = 1 -border_width_top = 1 -border_width_right = 1 -border_width_bottom = 1 -border_color = Color( 0.828125, 0.906524, 1, 1 ) +bg_color = Color( 0.329412, 0.329412, 0.329412, 0 ) +border_color = Color( 0.0931373, 0.0931373, 0.0931373, 1 ) +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 [sub_resource type="StyleBoxFlat" id=60] content_margin_left = 6.0 content_margin_right = 6.0 content_margin_top = 4.0 content_margin_bottom = 4.0 -bg_color = Color( 0.111765, 0.111765, 0.111765, 1 ) -border_width_left = 1 -border_width_top = 1 -border_width_right = 1 -border_width_bottom = 1 +bg_color = Color( 0.396078, 0.396078, 0.396078, 1 ) border_color = Color( 0.361765, 0.361765, 0.361765, 1 ) +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 -[sub_resource type="StyleBoxFlat" id=61] +[sub_resource type="StyleBoxFlat" id=128] content_margin_left = 6.0 content_margin_right = 6.0 content_margin_top = 4.0 content_margin_bottom = 4.0 -bg_color = Color( 0.111765, 0.111765, 0.111765, 1 ) -border_width_left = 1 -border_width_top = 1 -border_width_right = 1 -border_width_bottom = 1 +bg_color = Color( 0.329412, 0.329412, 0.329412, 1 ) border_color = Color( 0.0931373, 0.0931373, 0.0931373, 1 ) +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 [sub_resource type="StyleBoxFlat" id=62] content_margin_left = 6.0 content_margin_right = 6.0 content_margin_top = 4.0 content_margin_bottom = 4.0 -bg_color = Color( 0.111765, 0.111765, 0.111765, 1 ) -border_width_left = 1 -border_width_top = 1 -border_width_right = 1 -border_width_bottom = 1 +bg_color = Color( 0.25098, 0.368627, 0.54902, 1 ) border_color = Color( 0.828125, 0.906524, 1, 1 ) +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 [sub_resource type="StyleBoxFlat" id=63] content_margin_left = 4.0 @@ -137,8 +137,17 @@ content_margin_left = 6.0 content_margin_right = 6.0 content_margin_top = 4.0 content_margin_bottom = 4.0 -bg_color = Color( 0.113725, 0.113725, 0.113725, 0.847059 ) -border_color = Color( 0.0941176, 0.0941176, 0.0941176, 1 ) +bg_color = Color( 0.396078, 0.396078, 0.396078, 0 ) +border_color = Color( 0.239216, 0.239216, 0.239216, 1 ) +shadow_color = Color( 0, 0, 0, 1 ) + +[sub_resource type="StyleBoxFlat" id=135] +content_margin_left = 6.0 +content_margin_right = 6.0 +content_margin_top = 4.0 +content_margin_bottom = 4.0 +bg_color = Color( 0.329412, 0.329412, 0.329412, 0 ) +border_color = Color( 0.239216, 0.239216, 0.239216, 1 ) shadow_color = Color( 0, 0, 0, 1 ) [sub_resource type="StyleBoxFlat" id=66] @@ -181,7 +190,7 @@ content_margin_left = 2.0 content_margin_right = 2.0 content_margin_top = 0.0 content_margin_bottom = 2.0 -bg_color = Color( 0.169074, 0.175345, 0.182824, 1 ) +bg_color = Color( 0.168627, 0.176471, 0.184314, 1 ) border_width_left = 2 border_width_right = 2 border_width_bottom = 2 @@ -192,7 +201,7 @@ content_margin_left = 8.0 content_margin_right = 8.0 content_margin_top = 8.0 content_margin_bottom = 8.0 -bg_color = Color( 0.0931373, 0.0931373, 0.0931373, 1 ) +bg_color = Color( 0.0941176, 0.0941176, 0.0941176, 1 ) border_width_left = 1 border_width_top = 24 border_width_right = 1 @@ -250,11 +259,13 @@ content_margin_left = 10.0 content_margin_right = 10.0 content_margin_top = 5.0 content_margin_bottom = 5.0 -bg_color = Color( 0.111765, 0.111765, 0.111765, 1 ) +bg_color = Color( 0.188235, 0.188235, 0.188235, 1 ) border_width_left = 1 border_width_top = 1 border_width_right = 1 -border_color = Color( 0.0931373, 0.0931373, 0.0931373, 1 ) +border_color = Color( 0.113725, 0.113725, 0.113725, 1 ) +corner_radius_top_left = 3 +corner_radius_top_right = 3 expand_margin_bottom = 1.0 [sub_resource type="StyleBoxFlat" id=76] @@ -262,11 +273,13 @@ content_margin_left = 10.0 content_margin_right = 10.0 content_margin_top = 5.0 content_margin_bottom = 5.0 -bg_color = Color( 0.14902, 0.14902, 0.14902, 1 ) +bg_color = Color( 0.188235, 0.188235, 0.188235, 1 ) border_width_left = 1 border_width_top = 1 border_width_right = 1 -border_color = Color( 0.0745098, 0.0745098, 0.0745098, 1 ) +border_color = Color( 0.113725, 0.113725, 0.113725, 1 ) +corner_radius_top_left = 3 +corner_radius_top_right = 3 expand_margin_bottom = 1.0 [sub_resource type="StyleBoxFlat" id=77] @@ -274,7 +287,7 @@ content_margin_left = 4.0 content_margin_right = 4.0 content_margin_top = 4.0 content_margin_bottom = 4.0 -bg_color = Color( 0.14902, 0.14902, 0.14902, 1 ) +bg_color = Color( 0.188235, 0.188235, 0.188235, 1 ) draw_center = false border_width_left = 1 border_width_top = 1 @@ -323,7 +336,7 @@ content_margin_left = 4.0 content_margin_right = 4.0 content_margin_top = 4.0 content_margin_bottom = 4.0 -bg_color = Color( 0.111765, 0.111765, 0.111765, 1 ) +bg_color = Color( 0.156863, 0.156863, 0.156863, 1 ) border_width_left = 1 border_width_top = 1 border_width_right = 1 @@ -359,6 +372,10 @@ content_margin_top = 24.0 content_margin_bottom = 5.0 bg_color = Color( 0, 0, 0, 0.301961 ) border_color = Color( 1, 1, 1, 0.9 ) +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 shadow_color = Color( 0, 0, 0, 0.0784314 ) shadow_size = 5 shadow_offset = Vector2( 0, 3 ) @@ -374,6 +391,10 @@ border_width_top = 1 border_width_right = 1 border_width_bottom = 1 border_color = Color( 1, 1, 1, 0.9 ) +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 shadow_color = Color( 0, 0, 0, 0.117647 ) shadow_size = 5 shadow_offset = Vector2( 0, 3 ) @@ -383,13 +404,13 @@ content_margin_left = 28.0 content_margin_right = 28.0 content_margin_top = 24.0 content_margin_bottom = 5.0 -bg_color = Color( 0, 0, 0, 0.701961 ) +bg_color = Color( 0.188235, 0.188235, 0.188235, 1 ) border_width_top = 22 -border_color = Color( 0.376471, 0.376471, 0.376471, 0.701961 ) -corner_radius_top_left = 10 -corner_radius_top_right = 10 -corner_radius_bottom_right = 10 -corner_radius_bottom_left = 10 +border_color = Color( 0.313726, 0.313726, 0.313726, 1 ) +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 [sub_resource type="StyleBoxFlat" id=119] bg_color = Color( 0, 0, 0, 0 ) @@ -399,10 +420,10 @@ border_width_top = 1 border_width_right = 1 border_width_bottom = 1 border_color = Color( 1, 1, 1, 1 ) -corner_radius_top_left = 10 -corner_radius_top_right = 10 -corner_radius_bottom_right = 10 -corner_radius_bottom_left = 10 +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 [sub_resource type="StyleBoxFlat" id=88] content_margin_left = 28.0 @@ -424,13 +445,13 @@ content_margin_left = 28.0 content_margin_right = 28.0 content_margin_top = 24.0 content_margin_bottom = 5.0 -bg_color = Color( 0, 0, 0, 0.901961 ) +bg_color = Color( 0.188235, 0.188235, 0.188235, 1 ) border_width_top = 22 -border_color = Color( 0.376471, 0.376471, 0.376471, 0.901961 ) -corner_radius_top_left = 10 -corner_radius_top_right = 10 -corner_radius_bottom_right = 10 -corner_radius_bottom_left = 10 +border_color = Color( 0.313726, 0.313726, 0.313726, 1 ) +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 [sub_resource type="StyleBoxFlat" id=90] content_margin_left = 28.0 @@ -458,6 +479,39 @@ border_color = Color( 0.828125, 0.906524, 1, 0.9 ) shadow_color = Color( 0, 0, 0, 0.3 ) shadow_size = 8 +[sub_resource type="StyleBoxFlat" id=123] +bg_color = Color( 0.2, 0.2, 0.2, 1 ) +border_width_left = 1 +border_width_top = 1 +border_width_right = 1 +border_width_bottom = 1 +border_color = Color( 0.113725, 0.113725, 0.113725, 1 ) +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 + +[sub_resource type="StyleBoxFlat" id=124] +bg_color = Color( 0.329412, 0.329412, 0.329412, 1 ) +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 + +[sub_resource type="StyleBoxFlat" id=125] +bg_color = Color( 0.356863, 0.356863, 0.356863, 1 ) +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 + +[sub_resource type="StyleBoxFlat" id=126] +content_margin_left = 0.0 +content_margin_right = 0.0 +content_margin_top = 5.0 +content_margin_bottom = 5.0 +bg_color = Color( 0.113725, 0.113725, 0.113725, 1 ) + [sub_resource type="StyleBoxLine" id=92] color = Color( 1, 1, 1, 0.1 ) @@ -480,7 +534,7 @@ content_margin_left = 4.0 content_margin_right = 4.0 content_margin_top = 4.0 content_margin_bottom = 4.0 -bg_color = Color( 0.111765, 0.111765, 0.111765, 1 ) +bg_color = Color( 0.156863, 0.156863, 0.156863, 1 ) border_width_left = 1 border_width_top = 1 border_width_right = 1 @@ -505,7 +559,7 @@ content_margin_left = 4.0 content_margin_right = 4.0 content_margin_top = 4.0 content_margin_bottom = 4.0 -bg_color = Color( 1, 1, 1, 0.2 ) +bg_color = Color( 0.25098, 0.368627, 0.54902, 1 ) border_color = Color( 0.14902, 0.14902, 0.14902, 1 ) [sub_resource type="StyleBoxFlat" id=98] @@ -513,22 +567,104 @@ content_margin_left = 4.0 content_margin_right = 4.0 content_margin_top = 4.0 content_margin_bottom = 4.0 -bg_color = Color( 1, 1, 1, 0.2 ) +bg_color = Color( 0.278431, 0.447059, 0.701961, 1 ) border_color = Color( 0.14902, 0.14902, 0.14902, 1 ) +[sub_resource type="StyleBoxFlat" id=59] +content_margin_left = 6.0 +content_margin_right = 6.0 +content_margin_top = 4.0 +content_margin_bottom = 4.0 +bg_color = Color( 0.156863, 0.156863, 0.156863, 1 ) +border_width_left = 1 +border_width_top = 1 +border_width_right = 1 +border_width_bottom = 1 +border_color = Color( 0.828125, 0.906524, 1, 1 ) + +[sub_resource type="StyleBoxFlat" id=61] +content_margin_left = 6.0 +content_margin_right = 6.0 +content_margin_top = 4.0 +content_margin_bottom = 4.0 +bg_color = Color( 0.156863, 0.156863, 0.156863, 1 ) +border_color = Color( 0.239216, 0.239216, 0.239216, 1 ) + +[sub_resource type="StyleBoxFlat" id=133] +content_margin_left = 6.0 +content_margin_right = 6.0 +content_margin_top = 4.0 +content_margin_bottom = 4.0 +bg_color = Color( 0.188235, 0.188235, 0.188235, 1 ) +border_width_left = 1 +border_width_top = 1 +border_width_right = 1 +border_width_bottom = 1 +border_color = Color( 0.313726, 0.313726, 0.313726, 1 ) +shadow_color = Color( 0, 0, 0, 1 ) + +[sub_resource type="StyleBoxFlat" id=134] +content_margin_left = 6.0 +content_margin_right = 6.0 +content_margin_top = 4.0 +content_margin_bottom = 4.0 +bg_color = Color( 0.188235, 0.188235, 0.188235, 1 ) +border_color = Color( 0.0931373, 0.0931373, 0.0931373, 1 ) +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 + +[sub_resource type="StyleBoxFlat" id=131] +content_margin_left = 6.0 +content_margin_right = 6.0 +content_margin_top = 4.0 +content_margin_bottom = 4.0 +bg_color = Color( 0.156863, 0.156863, 0.156863, 1 ) +border_color = Color( 0.0931373, 0.0931373, 0.0931373, 1 ) +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 + +[sub_resource type="StyleBoxFlat" id=132] +content_margin_left = 6.0 +content_margin_right = 6.0 +content_margin_top = 4.0 +content_margin_bottom = 4.0 +bg_color = Color( 0.188235, 0.188235, 0.188235, 1 ) +border_width_left = 1 +border_width_top = 1 +border_width_right = 1 +border_width_bottom = 1 +border_color = Color( 0.27451, 0.27451, 0.27451, 1 ) +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 + [sub_resource type="StyleBoxFlat" id=99] content_margin_left = 6.0 content_margin_right = 6.0 content_margin_top = 4.0 content_margin_bottom = 4.0 -bg_color = Color( 0.111765, 0.111765, 0.111765, 1 ) +bg_color = Color( 0.113725, 0.113725, 0.113725, 1 ) + +[sub_resource type="StyleBoxFlat" id=136] +content_margin_left = 6.0 +content_margin_right = 6.0 +content_margin_top = 4.0 +content_margin_bottom = 4.0 +bg_color = Color( 0.188235, 0.188235, 0.188235, 1 ) +border_color = Color( 0.239216, 0.239216, 0.239216, 1 ) +shadow_color = Color( 0, 0, 0, 1 ) [sub_resource type="StyleBoxFlat" id=100] content_margin_left = 8.0 content_margin_right = 8.0 content_margin_top = 8.0 content_margin_bottom = 8.0 -bg_color = Color( 0.14902, 0.14902, 0.14902, 1 ) +bg_color = Color( 0.188235, 0.188235, 0.188235, 1 ) border_width_left = 1 border_width_top = 1 border_width_right = 1 @@ -542,7 +678,7 @@ content_margin_left = 6.0 content_margin_right = 6.0 content_margin_top = 4.0 content_margin_bottom = 4.0 -bg_color = Color( 0.111765, 0.111765, 0.111765, 1 ) +bg_color = Color( 0.278431, 0.447059, 0.701961, 1 ) border_color = Color( 0.0931373, 0.0931373, 0.0931373, 1 ) [sub_resource type="StyleBoxLine" id=102] @@ -584,7 +720,7 @@ content_margin_left = 5.0 content_margin_right = 5.0 content_margin_top = 5.0 content_margin_bottom = 5.0 -bg_color = Color( 0.14902, 0.14902, 0.14902, 1 ) +bg_color = Color( 0.188235, 0.188235, 0.188235, 1 ) border_width_left = 1 border_width_top = 1 border_width_right = 1 @@ -596,13 +732,27 @@ content_margin_left = 10.0 content_margin_right = 10.0 content_margin_top = 5.0 content_margin_bottom = 5.0 -bg_color = Color( 0.134118, 0.134118, 0.134118, 1 ) +bg_color = Color( 0.133333, 0.133333, 0.133333, 1 ) border_width_left = 1 border_width_top = 1 border_width_right = 1 -border_color = Color( 0.104314, 0.104314, 0.104314, 1 ) +border_color = Color( 0.113725, 0.113725, 0.113725, 1 ) +corner_radius_top_left = 3 +corner_radius_top_right = 3 expand_margin_bottom = 1.0 +[sub_resource type="StyleBoxFlat" id=129] +content_margin_left = 6.0 +content_margin_right = 6.0 +content_margin_top = 4.0 +content_margin_bottom = 4.0 +bg_color = Color( 0.156863, 0.156863, 0.156863, 1 ) +border_width_left = 1 +border_width_top = 1 +border_width_right = 1 +border_width_bottom = 1 +border_color = Color( 0.361765, 0.361765, 0.361765, 1 ) + [sub_resource type="StyleBoxFlat" id=108] content_margin_left = 1.0 content_margin_right = 1.0 @@ -647,7 +797,7 @@ content_margin_left = 4.0 content_margin_right = 4.0 content_margin_top = 4.0 content_margin_bottom = 4.0 -bg_color = Color( 1, 1, 1, 0.08 ) +bg_color = Color( 1, 1, 1, 0.0784314 ) border_color = Color( 0.14902, 0.14902, 0.14902, 1 ) [sub_resource type="StyleBoxFlat" id=114] @@ -658,6 +808,13 @@ content_margin_bottom = 4.0 bg_color = Color( 0.0745098, 0.0745098, 0.0745098, 1 ) border_color = Color( 0.14902, 0.14902, 0.14902, 1 ) +[sub_resource type="StyleBoxFlat" id=127] +content_margin_left = 5.0 +content_margin_right = 5.0 +content_margin_top = 0.0 +content_margin_bottom = 0.0 +bg_color = Color( 0.113725, 0.113725, 0.113725, 1 ) + [sub_resource type="StyleBoxLine" id=115] color = Color( 1, 1, 1, 0.1 ) grow_begin = 0.0 @@ -683,7 +840,7 @@ content_margin_left = 8.0 content_margin_right = 8.0 content_margin_top = 8.0 content_margin_bottom = 8.0 -bg_color = Color( 0.14902, 0.14902, 0.14902, 1 ) +bg_color = Color( 0.188235, 0.188235, 0.188235, 1 ) border_width_left = 1 border_width_top = 24 border_width_right = 1 @@ -695,6 +852,7 @@ shadow_size = 4 [resource] default_font = ExtResource( 58 ) +AddNodePopup/colors/accent = Color( 0.278431, 0.447059, 0.701961, 1 ) Button/colors/font_color = Color( 0.787255, 0.787255, 0.787255, 1 ) Button/colors/font_color_disabled = Color( 1, 1, 1, 0.3 ) Button/colors/font_color_hover = Color( 0.872353, 0.872353, 0.872353, 1 ) @@ -702,21 +860,21 @@ Button/colors/font_color_pressed = Color( 0.828125, 0.906524, 1, 1 ) Button/colors/icon_color_hover = Color( 1.15, 1.15, 1.15, 1 ) Button/colors/icon_color_pressed = Color( 0.952344, 1.0425, 1.15, 1 ) Button/constants/hseparation = 2 -Button/fonts/font = null +Button/fonts/font = ExtResource( 58 ) Button/styles/disabled = SubResource( 58 ) -Button/styles/focus = SubResource( 59 ) +Button/styles/focus = SubResource( 130 ) Button/styles/hover = SubResource( 60 ) -Button/styles/normal = SubResource( 61 ) +Button/styles/normal = SubResource( 128 ) Button/styles/pressed = SubResource( 62 ) -CheckBox/colors/font_color = Color( 0.787255, 0.787255, 0.787255, 1 ) +CheckBox/colors/font_color = Color( 0.788235, 0.788235, 0.788235, 1 ) CheckBox/colors/font_color_disabled = Color( 1, 1, 1, 0.3 ) CheckBox/colors/font_color_hover = Color( 0.872353, 0.872353, 0.872353, 1 ) CheckBox/colors/font_color_hover_pressed = Color( 1, 1, 1, 1 ) -CheckBox/colors/font_color_pressed = Color( 0.828125, 0.906524, 1, 1 ) -CheckBox/colors/icon_color_hover = Color( 1.15, 1.15, 1.15, 1 ) +CheckBox/colors/font_color_pressed = Color( 0.827451, 0.905882, 1, 1 ) +CheckBox/colors/icon_color_hover = Color( 1.14902, 1.14902, 1.14902, 1 ) CheckBox/constants/check_vadjust = 0 CheckBox/constants/hseparation = 4 -CheckBox/fonts/font = null +CheckBox/fonts/font = ExtResource( 58 ) CheckBox/icons/checked = ExtResource( 16 ) CheckBox/icons/radio_checked = ExtResource( 19 ) CheckBox/icons/radio_unchecked = ExtResource( 27 ) @@ -738,7 +896,7 @@ CheckButton/icons/off_disabled = ExtResource( 54 ) CheckButton/icons/on = ExtResource( 47 ) CheckButton/icons/on_disabled = ExtResource( 46 ) CheckButton/styles/disabled = SubResource( 65 ) -CheckButton/styles/hover = SubResource( 65 ) +CheckButton/styles/hover = SubResource( 135 ) CheckButton/styles/normal = SubResource( 65 ) CheckButton/styles/pressed = SubResource( 65 ) ColorPickerButton/colors/font_color = Color( 1, 1, 1, 1 ) @@ -746,7 +904,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( 58 ) ColorPickerButton/icons/bg = ExtResource( 43 ) ColorPickerButton/styles/hover = SubResource( 66 ) ColorPickerButton/styles/normal = SubResource( 67 ) @@ -831,6 +989,11 @@ GraphNode/styles/position = SubResource( 88 ) GraphNode/styles/selectedframe = SubResource( 89 ) GraphNode/styles/state_machine_frame = SubResource( 90 ) GraphNode/styles/state_machine_selectedframe = SubResource( 91 ) +HScrollBar/styles/grabber = SubResource( 123 ) +HScrollBar/styles/grabber_highlight = SubResource( 124 ) +HScrollBar/styles/grabber_pressed = SubResource( 125 ) +HScrollBar/styles/scroll = SubResource( 126 ) +HScrollBar/styles/scroll_focus = SubResource( 126 ) HSeparator/styles/separator = SubResource( 92 ) HSlider/icons/grabber = ExtResource( 11 ) HSlider/icons/grabber_disabled = ExtResource( 3 ) @@ -862,13 +1025,13 @@ Label/constants/shadow_offset_y = 1 Label/styles/normal = SubResource( 80 ) LineEdit/colors/clear_button_color = Color( 0.787255, 0.787255, 0.787255, 1 ) LineEdit/colors/clear_button_color_pressed = Color( 0.828125, 0.906524, 1, 1 ) -LineEdit/colors/cursor_color = Color( 0.787255, 0.787255, 0.787255, 1 ) +LineEdit/colors/cursor_color = Color( 0.788235, 0.788235, 0.788235, 1 ) LineEdit/colors/font_color = Color( 0.787255, 0.787255, 0.787255, 1 ) 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.828125, 0.906524, 1, 0.4 ) +LineEdit/colors/selection_color = Color( 0.827451, 0.905882, 1, 0.4 ) LineEdit/constants/minimum_spaces = 12 -LineEdit/fonts/font = null +LineEdit/fonts/font = ExtResource( 58 ) LineEdit/icons/clear = ExtResource( 17 ) LineEdit/styles/focus = SubResource( 59 ) LineEdit/styles/normal = SubResource( 61 ) @@ -880,12 +1043,14 @@ MenuButton/colors/font_color_disabled = Color( 1, 1, 1, 0.3 ) MenuButton/colors/font_color_hover = Color( 0.872353, 0.872353, 0.872353, 1 ) MenuButton/colors/font_color_pressed = Color( 1, 1, 1, 1 ) MenuButton/constants/hseparation = 3 -MenuButton/fonts/font = null +MenuButton/fonts/font = ExtResource( 58 ) MenuButton/styles/disabled = SubResource( 65 ) MenuButton/styles/focus = SubResource( 65 ) -MenuButton/styles/hover = SubResource( 65 ) +MenuButton/styles/hover = SubResource( 133 ) MenuButton/styles/normal = SubResource( 65 ) MenuButton/styles/pressed = SubResource( 65 ) +NodeSelectionButton/styles/hover = SubResource( 134 ) +NodeSelectionButton/styles/normal = SubResource( 131 ) OptionButton/colors/font_color = Color( 0.787255, 0.787255, 0.787255, 1 ) OptionButton/colors/font_color_disabled = Color( 1, 1, 1, 0.3 ) OptionButton/colors/font_color_hover = Color( 0.872353, 0.872353, 0.872353, 1 ) @@ -894,15 +1059,15 @@ 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( 58 ) OptionButton/icons/arrow = ExtResource( 8 ) OptionButton/styles/disabled = SubResource( 58 ) OptionButton/styles/focus = SubResource( 59 ) -OptionButton/styles/hover = SubResource( 60 ) +OptionButton/styles/hover = SubResource( 132 ) OptionButton/styles/normal = SubResource( 61 ) OptionButton/styles/pressed = SubResource( 62 ) Panel/styles/panel = SubResource( 99 ) -PanelContainer/styles/panel = SubResource( 65 ) +PanelContainer/styles/panel = SubResource( 136 ) PopupDialog/styles/panel = SubResource( 100 ) PopupMenu/colors/font_color = Color( 0.787255, 0.787255, 0.787255, 1 ) PopupMenu/colors/font_color_accel = Color( 1, 1, 1, 0.3 ) @@ -910,7 +1075,7 @@ PopupMenu/colors/font_color_disabled = Color( 1, 1, 1, 0.3 ) PopupMenu/colors/font_color_hover = Color( 0.872353, 0.872353, 0.872353, 1 ) PopupMenu/constants/hseparation = 4 PopupMenu/constants/vseparation = 5 -PopupMenu/fonts/font = null +PopupMenu/fonts/font = ExtResource( 58 ) PopupMenu/icons/checked = ExtResource( 57 ) PopupMenu/icons/radio_checked = ExtResource( 44 ) PopupMenu/icons/radio_unchecked = ExtResource( 33 ) @@ -948,7 +1113,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( 58 ) TabContainer/icons/decrement = ExtResource( 42 ) TabContainer/icons/decrement_highlight = ExtResource( 41 ) TabContainer/icons/increment = ExtResource( 40 ) @@ -992,19 +1157,19 @@ TextEdit/colors/mark_color = Color( 1, 0.4, 0.4, 0.4 ) TextEdit/colors/member_variable_color = Color( 0.901961, 0.305882, 0.34902, 1 ) TextEdit/colors/number_color = Color( 0.921569, 0.584314, 0.196078, 1 ) TextEdit/colors/safe_line_number_color = Color( 0.666667, 0.784314, 0.666667, 0.6 ) -TextEdit/colors/selection_color = Color( 0.828125, 0.906524, 1, 0.4 ) +TextEdit/colors/selection_color = Color( 0.83, 0.83, 1, 0.4 ) TextEdit/colors/symbol_color = Color( 0.941176, 0.941176, 0.941176, 1 ) -TextEdit/colors/word_highlighted_color = Color( 0.8, 0.9, 0.9, 0.15 ) +TextEdit/colors/word_highlighted_color = Color( 0.8, 0.9, 0.9, 0.4 ) 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( 58 ) TextEdit/icons/fold = ExtResource( 1 ) TextEdit/icons/folded = ExtResource( 25 ) TextEdit/icons/space = ExtResource( 2 ) TextEdit/icons/tab = ExtResource( 22 ) -TextEdit/styles/focus = SubResource( 60 ) +TextEdit/styles/focus = SubResource( 129 ) TextEdit/styles/normal = SubResource( 61 ) TextEdit/styles/read_only = SubResource( 58 ) ToolButton/colors/font_color = Color( 0.787255, 0.787255, 0.787255, 1 ) @@ -1035,8 +1200,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( 58 ) +Tree/fonts/title_button_font = ExtResource( 58 ) Tree/icons/arrow = ExtResource( 18 ) Tree/icons/arrow_collapsed = ExtResource( 6 ) Tree/icons/checked = ExtResource( 5 ) @@ -1057,6 +1222,11 @@ Tree/styles/selected_focus = SubResource( 98 ) Tree/styles/title_button_hover = SubResource( 114 ) Tree/styles/title_button_normal = SubResource( 114 ) Tree/styles/title_button_pressed = SubResource( 114 ) +VScrollBar/styles/grabber = SubResource( 123 ) +VScrollBar/styles/grabber_highlight = SubResource( 124 ) +VScrollBar/styles/grabber_pressed = SubResource( 125 ) +VScrollBar/styles/scroll = SubResource( 127 ) +VScrollBar/styles/scroll_focus = SubResource( 127 ) VSeparator/styles/separator = SubResource( 115 ) VSlider/icons/grabber = ExtResource( 37 ) VSlider/icons/grabber_highlight = ExtResource( 53 ) @@ -1069,7 +1239,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( 58 ) WindowDialog/icons/close = ExtResource( 4 ) WindowDialog/icons/close_highlight = ExtResource( 24 ) WindowDialog/styles/panel = SubResource( 118 ) diff --git a/material_maker/theme/default.tres b/material_maker/theme/default.tres index 1fda2b5ee..6765715e1 100644 --- a/material_maker/theme/default.tres +++ b/material_maker/theme/default.tres @@ -652,7 +652,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( 55 ) Button/styles/disabled = SubResource( 1 ) Button/styles/hover = SubResource( 2 ) Button/styles/normal = SubResource( 3 ) @@ -665,7 +665,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( 55 ) CheckBox/icons/checked = ExtResource( 34 ) CheckBox/icons/radio_checked = ExtResource( 10 ) CheckBox/icons/radio_unchecked = ExtResource( 13 ) @@ -804,7 +804,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( 55 ) LineEdit/icons/clear = ExtResource( 14 ) LineEdit/styles/normal = SubResource( 3 ) LineEdit/styles/read_only = SubResource( 1 ) @@ -815,7 +815,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( 55 ) MenuButton/styles/disabled = SubResource( 6 ) MenuButton/styles/focus = SubResource( 6 ) MenuButton/styles/hover = SubResource( 6 ) @@ -879,7 +879,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( 55 ) TabContainer/icons/decrement = ExtResource( 46 ) TabContainer/icons/decrement_highlight = ExtResource( 41 ) TabContainer/icons/increment = ExtResource( 40 ) @@ -969,7 +969,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( 55 ) WindowDialog/icons/close = ExtResource( 16 ) WindowDialog/icons/close_highlight = ExtResource( 12 ) WindowDialog/styles/panel = SubResource( 56 ) diff --git a/material_maker/widgets/color_picker_popup/color_picker_popup.tscn b/material_maker/widgets/color_picker_popup/color_picker_popup.tscn index 72189209e..cf739757a 100644 --- a/material_maker/widgets/color_picker_popup/color_picker_popup.tscn +++ b/material_maker/widgets/color_picker_popup/color_picker_popup.tscn @@ -1,14 +1,11 @@ [gd_scene format=2] [node name="ColorPickerPopup" type="PopupPanel"] -margin_right = 318.0 +margin_right = 316.0 margin_bottom = 470.0 [node name="ColorPicker" type="ColorPicker" parent="."] margin_left = 4.0 margin_top = 4.0 -margin_right = 314.0 +margin_right = 312.0 margin_bottom = 466.0 -__meta__ = { -"_edit_use_anchors_": false -} diff --git a/material_maker/widgets/graph_tree/graph_tree.tscn b/material_maker/widgets/graph_tree/graph_tree.tscn index e789a0d47..170e2b60d 100644 --- a/material_maker/widgets/graph_tree/graph_tree.tscn +++ b/material_maker/widgets/graph_tree/graph_tree.tscn @@ -18,7 +18,7 @@ Tree/colors/font_color = Color( 0.690196, 0.690196, 0.690196, 1 ) Tree/colors/font_color_selected = Color( 1, 1, 1, 1 ) Tree/colors/guide_color = Color( 0, 0, 0, 0.1 ) Tree/colors/relationship_line_color = Color( 0.27451, 0.27451, 0.27451, 1 ) -Tree/colors/selection_color = Color( 0.1, 0.1, 1, 0.8 ) +Tree/colors/selection_color = Color( 0.101961, 0.101961, 1, 0.8 ) Tree/colors/title_button_color = Color( 0.878431, 0.878431, 0.878431, 1 ) Tree/constants/button_margin = 4 Tree/constants/draw_guides = 1 @@ -60,5 +60,6 @@ script = ExtResource( 1 ) anchor_right = 1.0 anchor_bottom = 1.0 theme = SubResource( 2 ) + [connection signal="item_activated" from="Tree" to="." method="_on_Tree_item_double_clicked"] [connection signal="item_double_clicked" from="Tree" to="." method="_on_Tree_item_double_clicked"] diff --git a/material_maker/windows/add_node_popup/add_node_popup.gd b/material_maker/windows/add_node_popup/add_node_popup.gd index fbed55fed..9f307495c 100644 --- a/material_maker/windows/add_node_popup/add_node_popup.gd +++ b/material_maker/windows/add_node_popup/add_node_popup.gd @@ -27,7 +27,8 @@ func _ready() -> void: func _draw() -> void: - draw_rect(Rect2(0, 0, rect_size.x, rect_size.y), Color(1, 0.56, 0.56, 1), false, 2) + var current_theme : Theme = mm_globals.main_window.theme + draw_rect(Rect2(0, 0, rect_size.x, rect_size.y), current_theme.get_color("accent", "AddNodePopup"), false, 2) func filter_entered(_filter) -> void: diff --git a/material_maker/windows/add_node_popup/add_node_popup.tscn b/material_maker/windows/add_node_popup/add_node_popup.tscn index 93166d643..1a90fe2d6 100644 --- a/material_maker/windows/add_node_popup/add_node_popup.tscn +++ b/material_maker/windows/add_node_popup/add_node_popup.tscn @@ -191,14 +191,14 @@ default_library_item = "Filter/Normal map" [node name="Filter" type="LineEdit" parent="PanelContainer/VBoxContainer"] margin_top = 28.0 margin_right = 252.0 -margin_bottom = 52.0 +margin_bottom = 54.0 rect_min_size = Vector2( 0, 20 ) size_flags_horizontal = 3 clear_button_enabled = true placeholder_text = "Search..." [node name="ScrollContainer" type="ScrollContainer" parent="PanelContainer/VBoxContainer"] -margin_top = 56.0 +margin_top = 58.0 margin_right = 252.0 margin_bottom = 354.0 size_flags_vertical = 3 @@ -206,7 +206,7 @@ scroll_horizontal_enabled = false [node name="List" type="VBoxContainer" parent="PanelContainer/VBoxContainer/ScrollContainer"] margin_right = 252.0 -margin_bottom = 298.0 +margin_bottom = 296.0 size_flags_horizontal = 3 size_flags_vertical = 3 custom_constants/separation = 0 diff --git a/material_maker/windows/add_node_popup/node_selection_button.gd b/material_maker/windows/add_node_popup/node_selection_button.gd index e4ddf6f87..10bc0bba8 100644 --- a/material_maker/windows/add_node_popup/node_selection_button.gd +++ b/material_maker/windows/add_node_popup/node_selection_button.gd @@ -2,6 +2,11 @@ extends Button var path : String +func _enter_tree() -> void: + var theme : Theme = mm_globals.main_window.theme + for stylebox in theme.get_stylebox_list("NodeSelectionButton"): + add_stylebox_override(stylebox, theme.get_stylebox(stylebox, "NodeSelectionButton")) + func set_name(name: String) -> void: $HBoxContainer/HBoxContainer/Name.text = name diff --git a/material_maker/windows/add_node_popup/node_selection_button.tscn b/material_maker/windows/add_node_popup/node_selection_button.tscn index 90b1803b5..1f96ea1db 100644 --- a/material_maker/windows/add_node_popup/node_selection_button.tscn +++ b/material_maker/windows/add_node_popup/node_selection_button.tscn @@ -14,9 +14,6 @@ margin_right = 195.0 margin_bottom = 20.0 rect_min_size = Vector2( 0, 20 ) script = ExtResource( 2 ) -__meta__ = { -"_edit_use_anchors_": false -} [node name="HBoxContainer" type="HBoxContainer" parent="."] anchor_right = 1.0 diff --git a/material_maker/windows/file_dialog/fav_button.tscn b/material_maker/windows/file_dialog/fav_button.tscn index 3155d6363..b83062a4d 100644 --- a/material_maker/windows/file_dialog/fav_button.tscn +++ b/material_maker/windows/file_dialog/fav_button.tscn @@ -12,6 +12,3 @@ margin_right = 12.0 margin_bottom = 20.0 icon = SubResource( 1 ) flat = true -__meta__ = { -"_edit_use_anchors_": false -} diff --git a/material_maker/windows/node_editor/node_editor.tscn b/material_maker/windows/node_editor/node_editor.tscn index e8bef615c..de2c1dd19 100644 --- a/material_maker/windows/node_editor/node_editor.tscn +++ b/material_maker/windows/node_editor/node_editor.tscn @@ -244,11 +244,11 @@ __meta__ = { } [node name="HBoxContainer" type="HBoxContainer" parent="Sizer"] -margin_left = 366.0 +margin_left = 724.0 margin_top = 430.0 -margin_right = 584.0 +margin_right = 950.0 margin_bottom = 450.0 -size_flags_horizontal = 4 +size_flags_horizontal = 8 [node name="Apply" type="Button" parent="Sizer/HBoxContainer"] margin_right = 70.0 @@ -257,15 +257,15 @@ rect_min_size = Vector2( 70, 0 ) text = "Apply" [node name="OK" type="Button" parent="Sizer/HBoxContainer"] -margin_left = 74.0 -margin_right = 144.0 +margin_left = 78.0 +margin_right = 148.0 margin_bottom = 20.0 rect_min_size = Vector2( 70, 0 ) text = "OK" [node name="Cancel" type="Button" parent="Sizer/HBoxContainer"] -margin_left = 148.0 -margin_right = 218.0 +margin_left = 156.0 +margin_right = 226.0 margin_bottom = 20.0 rect_min_size = Vector2( 70, 0 ) text = "Cancel" diff --git a/material_maker/windows/preferences/preferences.tscn b/material_maker/windows/preferences/preferences.tscn index 2c2925579..65f5646bb 100644 --- a/material_maker/windows/preferences/preferences.tscn +++ b/material_maker/windows/preferences/preferences.tscn @@ -33,8 +33,8 @@ __meta__ = { } [node name="TabContainer" type="TabContainer" parent="VBoxContainer"] -margin_right = 302.0 -margin_bottom = 320.0 +margin_right = 304.0 +margin_bottom = 322.0 rect_min_size = Vector2( 289, 172 ) size_flags_horizontal = 3 size_flags_vertical = 3 @@ -76,8 +76,8 @@ margin_bottom = 20.0 text = "Install" [node name="DownloadLanguage" type="Button" parent="VBoxContainer/TabContainer/General/HBoxContainer"] -margin_left = 100.0 -margin_right = 152.0 +margin_left = 156.0 +margin_right = 231.0 margin_bottom = 20.0 text = "Download" @@ -405,16 +405,16 @@ text = "Auto size comment node to selection" config_variable = "auto_size_comment" [node name="HSeparator" type="HSeparator" parent="VBoxContainer"] -margin_top = 324.0 -margin_right = 302.0 -margin_bottom = 324.0 +margin_top = 326.0 +margin_right = 304.0 +margin_bottom = 326.0 custom_constants/separation = 0 [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"] -margin_left = 114.0 -margin_top = 328.0 -margin_right = 302.0 -margin_bottom = 348.0 +margin_left = 116.0 +margin_top = 330.0 +margin_right = 304.0 +margin_bottom = 350.0 size_flags_horizontal = 8 [node name="Apply" type="Button" parent="VBoxContainer/HBoxContainer"]