diff --git a/game/main/Main.tscn b/game/main/Main.tscn index dbe1ee3..d487ee7 100644 --- a/game/main/Main.tscn +++ b/game/main/Main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=35 format=3 uid="uid://ggbp6fch244c"] +[gd_scene load_steps=32 format=3 uid="uid://ggbp6fch244c"] [ext_resource type="Script" path="res://main/main.gd" id="1_2pidp"] [ext_resource type="Theme" uid="uid://co20v1mxv2dfm" path="res://main/ui/_theme/theme.tres" id="2_nb65v"] @@ -31,30 +31,6 @@ bg_color = Color(0.509804, 0.517647, 0.560784, 1) expand_margin_top = 30.0 -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_dha6b"] -bg_color = Color(0.4, 0.4, 0.45098, 1) -corner_radius_top_left = 4 -corner_radius_top_right = 4 -corner_radius_bottom_right = 4 -corner_radius_bottom_left = 4 -anti_aliasing = false - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_3h7k3"] -bg_color = Color(0.188235, 0.188235, 0.239216, 1) -corner_radius_top_left = 4 -corner_radius_top_right = 4 -corner_radius_bottom_right = 4 -corner_radius_bottom_left = 4 -anti_aliasing = false - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7pq0y"] -bg_color = Color(0.313726, 0.313726, 0.360784, 1) -corner_radius_top_left = 4 -corner_radius_top_right = 4 -corner_radius_bottom_right = 4 -corner_radius_bottom_left = 4 -anti_aliasing = false - [sub_resource type="Animation" id="Animation_sr1iu"] length = 0.001 tracks/0/type = "value" @@ -220,9 +196,6 @@ layout_mode = 2 size_flags_horizontal = 2 focus_mode = 0 theme_override_font_sizes/font_size = 18 -theme_override_styles/hover = SubResource("StyleBoxFlat_dha6b") -theme_override_styles/pressed = SubResource("StyleBoxFlat_3h7k3") -theme_override_styles/normal = SubResource("StyleBoxFlat_7pq0y") icon = ExtResource("9_1ns3c") icon_alignment = 1 diff --git a/game/main/element_manager/element_material/textures/crystal.png b/game/main/element_manager/element_material/textures/crystal.png deleted file mode 100644 index 94fb2b1..0000000 Binary files a/game/main/element_manager/element_material/textures/crystal.png and /dev/null differ diff --git a/game/main/element_manager/element_material/textures/fire_noise.png b/game/main/element_manager/element_material/textures/fire_noise.png deleted file mode 100644 index e8bc7a4..0000000 Binary files a/game/main/element_manager/element_material/textures/fire_noise.png and /dev/null differ diff --git a/game/main/element_manager/element_material/textures/fire_noise.png.import b/game/main/element_manager/element_material/textures/fire_noise.png.import deleted file mode 100644 index 667ae48..0000000 --- a/game/main/element_manager/element_material/textures/fire_noise.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c14orypm760fe" -path="res://.godot/imported/fire_noise.png-8ff79eff29692b64dc577017cd12b9bd.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://main/element_manager/element_material/textures/fire_noise.png" -dest_files=["res://.godot/imported/fire_noise.png-8ff79eff29692b64dc577017cd12b9bd.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/main/element_manager/element_material/textures/water_noise.png b/game/main/element_manager/element_material/textures/water_noise.png deleted file mode 100644 index fe7ac41..0000000 Binary files a/game/main/element_manager/element_material/textures/water_noise.png and /dev/null differ diff --git a/game/main/element_manager/element_material/textures/water_noise.png.import b/game/main/element_manager/element_material/textures/water_noise.png.import deleted file mode 100644 index 5e925cd..0000000 --- a/game/main/element_manager/element_material/textures/water_noise.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dwneer3dth3iw" -path="res://.godot/imported/water_noise.png-20bc78fb427f44109db2295fc69f5547.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://main/element_manager/element_material/textures/water_noise.png" -dest_files=["res://.godot/imported/water_noise.png-20bc78fb427f44109db2295fc69f5547.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=0 diff --git a/game/main/ui/_theme/theme.tres b/game/main/ui/_theme/theme.tres index e2925be..ecf186c 100644 --- a/game/main/ui/_theme/theme.tres +++ b/game/main/ui/_theme/theme.tres @@ -1,4 +1,4 @@ -[gd_resource type="Theme" load_steps=26 format=3 uid="uid://co20v1mxv2dfm"] +[gd_resource type="Theme" load_steps=27 format=3 uid="uid://co20v1mxv2dfm"] [ext_resource type="Texture2D" uid="uid://cm0u56vk6gqu3" path="res://main/ui/_icons/toggle1.png" id="1_coee0"] [ext_resource type="Texture2D" uid="uid://l1h1lwsmjxdv" path="res://main/ui/_icons/icon_circle.png" id="1_mvg4m"] @@ -6,6 +6,7 @@ [ext_resource type="Texture2D" uid="uid://cwrw6b4hfr57h" path="res://main/ui/_icons/icon_circle2.png" id="1_q36yb"] [ext_resource type="Texture2D" uid="uid://dbcnelrjqy5sr" path="res://main/ui/_icons/toggle2.png" id="2_1j6w3"] [ext_resource type="Texture2D" uid="uid://du0y3fdwj5xc1" path="res://main/ui/empty.png" id="5_vmfmg"] +[ext_resource type="Texture2D" uid="uid://c27djxlyp41fw" path="res://main/ui/empty_big.png" id="6_5xet3"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_dsk6v"] bg_color = Color(0.223529, 0.215686, 0.278431, 0.321569) @@ -17,6 +18,8 @@ anti_aliasing = false [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_xa765"] bg_color = Color(0.313726, 0.313726, 0.360784, 1) +border_width_bottom = 4 +border_color = Color(0.223529, 0.215686, 0.278431, 1) corner_radius_top_left = 4 corner_radius_top_right = 4 corner_radius_bottom_right = 4 @@ -152,6 +155,10 @@ CheckButton/icons/unchecked = ExtResource("2_1j6w3") ColorPicker/icons/sample_bg = ExtResource("5_vmfmg") ColorPickerButton/icons/bg = ExtResource("5_vmfmg") ColorPickerButton/styles/normal = SubResource("StyleBoxFlat_e4p0n") +HSlider/icons/grabber = ExtResource("6_5xet3") +HSlider/icons/grabber_disabled = ExtResource("6_5xet3") +HSlider/icons/grabber_highlight = ExtResource("6_5xet3") +HSlider/icons/tick = null MenuButton/styles/hover = SubResource("StyleBoxFlat_11w6c") OptionButton/font_sizes/font_size = 21 PopupMenu/colors/font_color = Color(1, 1, 1, 1) diff --git a/game/main/ui/empty_big.png b/game/main/ui/empty_big.png new file mode 100644 index 0000000..5e4988e Binary files /dev/null and b/game/main/ui/empty_big.png differ diff --git a/game/main/element_manager/element_material/textures/crystal.png.import b/game/main/ui/empty_big.png.import similarity index 66% rename from game/main/element_manager/element_material/textures/crystal.png.import rename to game/main/ui/empty_big.png.import index ebdee79..eea3515 100644 --- a/game/main/element_manager/element_material/textures/crystal.png.import +++ b/game/main/ui/empty_big.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c8x4qb3gijjgs" -path="res://.godot/imported/crystal.png-df106500142a796b9e5a9bbf87dd430a.ctex" +uid="uid://c27djxlyp41fw" +path="res://.godot/imported/empty_big.png-de6f9eea7dbd3b2e592218e41e2ade46.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://main/element_manager/element_material/textures/crystal.png" -dest_files=["res://.godot/imported/crystal.png-df106500142a796b9e5a9bbf87dd430a.ctex"] +source_file="res://main/ui/empty_big.png" +dest_files=["res://.godot/imported/empty_big.png-de6f9eea7dbd3b2e592218e41e2ade46.ctex"] [params] diff --git a/game/main/ui/submenu/element_editor/ElementEditor.tscn b/game/main/ui/submenu/element_editor/ElementEditor.tscn index a2e7d00..1c8c978 100644 --- a/game/main/ui/submenu/element_editor/ElementEditor.tscn +++ b/game/main/ui/submenu/element_editor/ElementEditor.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=26 format=3 uid="uid://bqwqmevgndrm0"] +[gd_scene load_steps=29 format=3 uid="uid://bqwqmevgndrm0"] [ext_resource type="Theme" uid="uid://co20v1mxv2dfm" path="res://main/ui/_theme/theme.tres" id="1_gu8tf"] [ext_resource type="Script" path="res://main/ui/submenu/element_editor/element_editor_menu.gd" id="2_ae0hb"] [ext_resource type="FontFile" uid="uid://b8lxwo5dkwrs4" path="res://main/ui/_theme/font/Poppins-Regular.ttf" id="3_gc23u"] [ext_resource type="Texture2D" uid="uid://skg5bmd8m812" path="res://main/ui/_icons/close.png" id="4_8lnwy"] +[ext_resource type="Texture2D" uid="uid://c27djxlyp41fw" path="res://main/ui/empty_big.png" id="5_a6efk"] [ext_resource type="PackedScene" uid="uid://dw3yr1ktgbep0" path="res://main/ui/element_selector/ElementPickerButton.tscn" id="5_d2qg0"] [ext_resource type="PackedScene" uid="uid://danjqv04qm3f6" path="res://main/ui/element_selector/ElementSelector.tscn" id="7_jk2v0"] @@ -109,6 +110,23 @@ expand_margin_top = 5.0 expand_margin_bottom = 5.0 anti_aliasing = false +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_pfoya"] +bg_color = Color(0.278431, 0.0470588, 0.12549, 1) +border_color = Color(0.28, 0.0476, 0.125067, 1) +corner_radius_top_left = 4 +corner_radius_top_right = 4 +corner_radius_bottom_right = 4 +corner_radius_bottom_left = 4 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_o53s1"] +bg_color = Color(0.4, 0.088, 0.1088, 1) +border_width_bottom = 4 +border_color = Color(0.28, 0.0476, 0.125067, 1) +corner_radius_top_left = 4 +corner_radius_top_right = 4 +corner_radius_bottom_right = 4 +corner_radius_bottom_left = 4 + [sub_resource type="Animation" id="Animation_swdin"] length = 0.001 tracks/0/type = "value" @@ -320,7 +338,7 @@ text = "Element Editor" custom_minimum_size = Vector2(50, 50) layout_mode = 2 size_flags_horizontal = 8 -size_flags_vertical = 0 +size_flags_vertical = 8 focus_mode = 0 icon = ExtResource("4_8lnwy") icon_alignment = 1 @@ -330,6 +348,7 @@ unique_name_in_owner = true layout_mode = 2 size_flags_vertical = 3 theme_override_styles/panel = SubResource("StyleBoxEmpty_hcor6") +scroll_vertical = 100 vertical_scroll_mode = 2 [node name="MarginContainer" type="MarginContainer" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer"] @@ -513,9 +532,13 @@ size_flags_horizontal = 3 [node name="Density" type="HSlider" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/MarginContainer/VBoxContainer/DensityGrouping/VBoxContainer"] unique_name_in_owner = true +texture_filter = 1 layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 4 +focus_mode = 0 +theme_override_icons/grabber = ExtResource("5_a6efk") +theme_override_icons/grabber_highlight = ExtResource("5_a6efk") theme_override_styles/slider = SubResource("StyleBoxFlat_70ulr") theme_override_styles/grabber_area = SubResource("StyleBoxFlat_o5yxv") theme_override_styles/grabber_area_highlight = SubResource("StyleBoxFlat_5uj0p") @@ -556,6 +579,9 @@ unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 4 +focus_mode = 0 +theme_override_icons/grabber = ExtResource("5_a6efk") +theme_override_icons/grabber_highlight = ExtResource("5_a6efk") theme_override_styles/slider = SubResource("StyleBoxFlat_70ulr") theme_override_styles/grabber_area = SubResource("StyleBoxFlat_o5yxv") theme_override_styles/grabber_area_highlight = SubResource("StyleBoxFlat_5uj0p") @@ -596,6 +622,9 @@ unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 4 +focus_mode = 0 +theme_override_icons/grabber = ExtResource("5_a6efk") +theme_override_icons/grabber_highlight = ExtResource("5_a6efk") theme_override_styles/slider = SubResource("StyleBoxFlat_70ulr") theme_override_styles/grabber_area = SubResource("StyleBoxFlat_o5yxv") theme_override_styles/grabber_area_highlight = SubResource("StyleBoxFlat_5uj0p") @@ -636,6 +665,9 @@ unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 4 +focus_mode = 0 +theme_override_icons/grabber = ExtResource("5_a6efk") +theme_override_icons/grabber_highlight = ExtResource("5_a6efk") theme_override_styles/slider = SubResource("StyleBoxFlat_70ulr") theme_override_styles/grabber_area = SubResource("StyleBoxFlat_o5yxv") theme_override_styles/grabber_area_highlight = SubResource("StyleBoxFlat_5uj0p") @@ -675,6 +707,9 @@ unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 4 +focus_mode = 0 +theme_override_icons/grabber = ExtResource("5_a6efk") +theme_override_icons/grabber_highlight = ExtResource("5_a6efk") theme_override_styles/slider = SubResource("StyleBoxFlat_70ulr") theme_override_styles/grabber_area = SubResource("StyleBoxFlat_o5yxv") theme_override_styles/grabber_area_highlight = SubResource("StyleBoxFlat_5uj0p") @@ -715,6 +750,9 @@ unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 4 +focus_mode = 0 +theme_override_icons/grabber = ExtResource("5_a6efk") +theme_override_icons/grabber_highlight = ExtResource("5_a6efk") theme_override_styles/slider = SubResource("StyleBoxFlat_70ulr") theme_override_styles/grabber_area = SubResource("StyleBoxFlat_o5yxv") theme_override_styles/grabber_area_highlight = SubResource("StyleBoxFlat_5uj0p") @@ -754,6 +792,9 @@ unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 4 +focus_mode = 0 +theme_override_icons/grabber = ExtResource("5_a6efk") +theme_override_icons/grabber_highlight = ExtResource("5_a6efk") theme_override_styles/slider = SubResource("StyleBoxFlat_70ulr") theme_override_styles/grabber_area = SubResource("StyleBoxFlat_o5yxv") theme_override_styles/grabber_area_highlight = SubResource("StyleBoxFlat_5uj0p") @@ -794,6 +835,9 @@ unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 4 +focus_mode = 0 +theme_override_icons/grabber = ExtResource("5_a6efk") +theme_override_icons/grabber_highlight = ExtResource("5_a6efk") theme_override_styles/slider = SubResource("StyleBoxFlat_70ulr") theme_override_styles/grabber_area = SubResource("StyleBoxFlat_o5yxv") theme_override_styles/grabber_area_highlight = SubResource("StyleBoxFlat_5uj0p") @@ -1032,11 +1076,21 @@ unique_name_in_owner = true layout_mode = 2 element_picker = NodePath("../../../../../../../../../ElementPickerContainer/ElementSelector") -[node name="DeleteButton" type="Button" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/MarginContainer/VBoxContainer"] +[node name="DeleteButton" type="Button" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/MarginContainer/VBoxContainer" groups=["keep_style"]] unique_name_in_owner = true layout_mode = 2 focus_mode = 0 +theme_override_colors/font_color = Color(1, 1, 1, 1) +theme_override_colors/font_focus_color = Color(1, 1, 1, 1) +theme_override_colors/font_pressed_color = Color(1, 1, 1, 1) +theme_override_colors/font_hover_color = Color(1, 1, 1, 1) +theme_override_colors/font_hover_pressed_color = Color(1, 1, 1, 1) theme_override_font_sizes/font_size = 21 +theme_override_styles/hover_pressed_mirrored = SubResource("StyleBoxFlat_pfoya") +theme_override_styles/hover = SubResource("StyleBoxFlat_o53s1") +theme_override_styles/pressed_mirrored = SubResource("StyleBoxFlat_pfoya") +theme_override_styles/pressed = SubResource("StyleBoxFlat_pfoya") +theme_override_styles/normal = SubResource("StyleBoxFlat_o53s1") text = "delete element" [node name="AnimationPlayer" type="AnimationPlayer" parent="."] diff --git a/game/main/ui/submenu/save/save_file_panel/SaveFilePanel.tscn b/game/main/ui/submenu/save/save_file_panel/SaveFilePanel.tscn index cf8f81c..04fc3a9 100644 --- a/game/main/ui/submenu/save/save_file_panel/SaveFilePanel.tscn +++ b/game/main/ui/submenu/save/save_file_panel/SaveFilePanel.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=3 uid="uid://3k2xt0kc4klb"] +[gd_scene load_steps=14 format=3 uid="uid://3k2xt0kc4klb"] [ext_resource type="Theme" uid="uid://co20v1mxv2dfm" path="res://main/ui/_theme/theme.tres" id="1_1uvf0"] [ext_resource type="Script" path="res://main/ui/submenu/save/save_file_panel/save_file_panel.gd" id="1_ftssb"] @@ -34,17 +34,40 @@ shader_parameter/square_scale = 0.1 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_61jks"] bg_color = Color(0.313726, 0.313726, 0.360784, 1) -border_width_left = 2 -border_width_top = 2 -border_width_right = 2 -border_width_bottom = 2 -border_color = Color(0.56021, 0.560483, 0.619759, 1) +border_width_bottom = 4 +border_color = Color(0.187626, 0.180723, 0.235823, 1) +corner_radius_top_left = 4 +corner_radius_top_right = 4 +corner_radius_bottom_right = 4 +corner_radius_bottom_left = 4 +anti_aliasing = false + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_4rilo"] +bg_color = Color(0.188235, 0.180392, 0.235294, 1) +border_color = Color(0.151841, 0.145909, 0.193175, 1) corner_radius_top_left = 4 corner_radius_top_right = 4 corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 anti_aliasing = false +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7aktq"] +bg_color = Color(0.4, 0.088, 0.1088, 1) +border_width_bottom = 4 +border_color = Color(0.28, 0.0476, 0.125067, 1) +corner_radius_top_left = 4 +corner_radius_top_right = 4 +corner_radius_bottom_right = 4 +corner_radius_bottom_left = 4 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_wrnao"] +bg_color = Color(0.278431, 0.0470588, 0.12549, 1) +border_color = Color(0.28, 0.0476, 0.125067, 1) +corner_radius_top_left = 4 +corner_radius_top_right = 4 +corner_radius_bottom_right = 4 +corner_radius_bottom_left = 4 + [node name="SaveFilePanel" type="PanelContainer" node_paths=PackedStringArray("name_label", "date_label", "size_label", "thumbnail")] anchors_preset = 10 anchor_right = 1.0 @@ -121,40 +144,52 @@ layout_mode = 2 size_flags_vertical = 8 theme_override_constants/separation = 8 -[node name="Save" type="Button" parent="MarginContainer/ButtonContainer"] +[node name="Save" type="Button" parent="MarginContainer/ButtonContainer" groups=["keep_style"]] unique_name_in_owner = true custom_minimum_size = Vector2(84, 0) layout_mode = 2 focus_mode = 0 theme_override_colors/font_color = Color(1, 1, 1, 1) +theme_override_colors/font_focus_color = Color(1, 1, 1, 1) +theme_override_colors/font_pressed_color = Color(1, 1, 1, 1) +theme_override_colors/font_hover_color = Color(1, 1, 1, 1) +theme_override_colors/font_hover_pressed_color = Color(1, 1, 1, 1) theme_override_font_sizes/font_size = 21 theme_override_styles/hover = SubResource("StyleBoxFlat_61jks") -theme_override_styles/pressed = SubResource("StyleBoxFlat_61jks") +theme_override_styles/pressed = SubResource("StyleBoxFlat_4rilo") theme_override_styles/normal = SubResource("StyleBoxFlat_61jks") text = "save" -[node name="Load" type="Button" parent="MarginContainer/ButtonContainer"] +[node name="Load" type="Button" parent="MarginContainer/ButtonContainer" groups=["keep_style"]] unique_name_in_owner = true custom_minimum_size = Vector2(84, 0) layout_mode = 2 focus_mode = 0 theme_override_colors/font_color = Color(1, 1, 1, 1) +theme_override_colors/font_focus_color = Color(1, 1, 1, 1) +theme_override_colors/font_pressed_color = Color(1, 1, 1, 1) +theme_override_colors/font_hover_color = Color(1, 1, 1, 1) +theme_override_colors/font_hover_pressed_color = Color(1, 1, 1, 1) theme_override_font_sizes/font_size = 21 theme_override_styles/hover = SubResource("StyleBoxFlat_61jks") -theme_override_styles/pressed = SubResource("StyleBoxFlat_61jks") +theme_override_styles/pressed = SubResource("StyleBoxFlat_4rilo") theme_override_styles/normal = SubResource("StyleBoxFlat_61jks") text = "load" -[node name="Delete" type="Button" parent="MarginContainer/ButtonContainer"] +[node name="Delete" type="Button" parent="MarginContainer/ButtonContainer" groups=["keep_style"]] unique_name_in_owner = true custom_minimum_size = Vector2(84, 0) layout_mode = 2 focus_mode = 0 theme_override_colors/font_color = Color(1, 1, 1, 1) +theme_override_colors/font_focus_color = Color(1, 1, 1, 1) +theme_override_colors/font_pressed_color = Color(1, 1, 1, 1) +theme_override_colors/font_hover_color = Color(1, 1, 1, 1) +theme_override_colors/font_hover_pressed_color = Color(1, 1, 1, 1) theme_override_font_sizes/font_size = 21 -theme_override_styles/hover = SubResource("StyleBoxFlat_61jks") -theme_override_styles/pressed = SubResource("StyleBoxFlat_61jks") -theme_override_styles/normal = SubResource("StyleBoxFlat_61jks") +theme_override_styles/hover = SubResource("StyleBoxFlat_7aktq") +theme_override_styles/pressed = SubResource("StyleBoxFlat_wrnao") +theme_override_styles/normal = SubResource("StyleBoxFlat_7aktq") text = "trash" [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] diff --git a/game/main/ui/submenu/settings/SettingsMenu.tscn b/game/main/ui/submenu/settings/SettingsMenu.tscn index 07023c4..2d93f4c 100644 --- a/game/main/ui/submenu/settings/SettingsMenu.tscn +++ b/game/main/ui/submenu/settings/SettingsMenu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=16 format=3 uid="uid://bi1khomdif7xb"] +[gd_scene load_steps=18 format=3 uid="uid://bi1khomdif7xb"] [ext_resource type="Theme" uid="uid://co20v1mxv2dfm" path="res://main/ui/_theme/theme.tres" id="1_f12ql"] [ext_resource type="Script" path="res://main/ui/submenu/settings/settings_menu.gd" id="2_1g5bn"] @@ -32,6 +32,7 @@ corner_radius_bottom_right = 6 corner_radius_bottom_left = 6 expand_margin_top = 4.0 expand_margin_bottom = 4.0 +anti_aliasing = false [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_27i0d"] bg_color = Color(0.764706, 0.764706, 0.788235, 1) @@ -41,6 +42,7 @@ corner_radius_bottom_right = 6 corner_radius_bottom_left = 6 expand_margin_top = 5.0 expand_margin_bottom = 5.0 +anti_aliasing = false [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_420ld"] bg_color = Color(0.898039, 0.898039, 0.909804, 1) @@ -50,10 +52,28 @@ corner_radius_bottom_right = 6 corner_radius_bottom_left = 6 expand_margin_top = 5.0 expand_margin_bottom = 5.0 +anti_aliasing = false [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_5rheo"] bg_color = Color(0.6, 0.6, 0.6, 0) +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_odjbe"] +bg_color = Color(0.4, 0.088, 0.1088, 1) +border_width_bottom = 4 +border_color = Color(0.28, 0.0476, 0.125067, 1) +corner_radius_top_left = 4 +corner_radius_top_right = 4 +corner_radius_bottom_right = 4 +corner_radius_bottom_left = 4 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_os8ri"] +bg_color = Color(0.278431, 0.0470588, 0.12549, 1) +border_color = Color(0.28, 0.0476, 0.125067, 1) +corner_radius_top_left = 4 +corner_radius_top_right = 4 +corner_radius_bottom_right = 4 +corner_radius_bottom_left = 4 + [sub_resource type="Animation" id="Animation_swdin"] length = 0.001 tracks/0/type = "value" @@ -229,6 +249,7 @@ unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 10 +focus_mode = 0 theme_override_styles/slider = SubResource("StyleBoxFlat_xw2ew") theme_override_styles/grabber_area = SubResource("StyleBoxFlat_27i0d") theme_override_styles/grabber_area_highlight = SubResource("StyleBoxFlat_420ld") @@ -281,6 +302,7 @@ unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 10 +focus_mode = 0 theme_override_styles/slider = SubResource("StyleBoxFlat_xw2ew") theme_override_styles/grabber_area = SubResource("StyleBoxFlat_27i0d") theme_override_styles/grabber_area_highlight = SubResource("StyleBoxFlat_420ld") @@ -331,6 +353,7 @@ unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 10 +focus_mode = 0 theme_override_styles/slider = SubResource("StyleBoxFlat_xw2ew") theme_override_styles/grabber_area = SubResource("StyleBoxFlat_27i0d") theme_override_styles/grabber_area_highlight = SubResource("StyleBoxFlat_420ld") @@ -433,6 +456,9 @@ layout_mode = 2 size_flags_vertical = 0 focus_mode = 0 theme_override_font_sizes/font_size = 21 +theme_override_styles/hover = SubResource("StyleBoxFlat_odjbe") +theme_override_styles/pressed = SubResource("StyleBoxFlat_os8ri") +theme_override_styles/normal = SubResource("StyleBoxFlat_odjbe") text = "clear screen" [node name="AnimationPlayer" type="AnimationPlayer" parent="."] diff --git a/game/main/ui/ui.gd b/game/main/ui/ui.gd index e0bf260..1b49e06 100644 --- a/game/main/ui/ui.gd +++ b/game/main/ui/ui.gd @@ -38,14 +38,15 @@ func _ready() -> void: while len(c) > 0: var x = c.pop_back() if x is Button: - x.action_mode = BaseButton.ACTION_MODE_BUTTON_PRESS + x.action_mode = BaseButton.ACTION_MODE_BUTTON_RELEASE if x is ElementButton: x.pressed_long.connect(_on_button_down) else: x.pressed.connect(_on_button_down) - x.set("theme_override_styles/pressed", x.get("theme_override_styles/normal")) - x.set("theme_override_styles/hover", x.get("theme_override_styles/normal")) - x.set("action_mode", BaseButton.ActionMode.ACTION_MODE_BUTTON_RELEASE) + if not x.is_in_group("keep_style"): + x.set("theme_override_styles/pressed", x.get("theme_override_styles/normal")) + x.set("theme_override_styles/hover", x.get("theme_override_styles/normal")) + x.set("action_mode", BaseButton.ActionMode.ACTION_MODE_BUTTON_RELEASE) if x is TabBar: x.tab_clicked.connect(_on_button_down) c.append_array(x.get_children(true)) diff --git a/game/project.godot b/game/project.godot index 45ebff9..9340175 100644 --- a/game/project.godot +++ b/game/project.godot @@ -45,6 +45,10 @@ folder_colors={ "res://main/": "yellow" } +[global_group] + +keep_style="" + [input] ui_left={