Skip to content

Commit

Permalink
Polished UI
Browse files Browse the repository at this point in the history
  • Loading branch information
kiwijuice56 committed Feb 15, 2024
1 parent 0faf5c4 commit 56dc516
Show file tree
Hide file tree
Showing 14 changed files with 150 additions and 13 deletions.
Binary file modified .sconsign.dblite
Binary file not shown.
Binary file modified extension/sand_simulation.os
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added game/icon_extra_large.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions game/icon_extra_large.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://du551rl86h0dv"
path="res://.godot/imported/icon_extra_large.png-a6f45c73b8859c5ded89738779bd0f59.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://icon_extra_large.png"
dest_files=["res://.godot/imported/icon_extra_large.png-a6f45c73b8859c5ded89738779bd0f59.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
Binary file added game/icon_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions game/icon_small.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://b5nl4c35gkuuo"
path="res://.godot/imported/icon_small.png-3c8714959a1b0bb9c515ee8bdcab7a89.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://icon_small.png"
dest_files=["res://.godot/imported/icon_small.png-3c8714959a1b0bb9c515ee8bdcab7a89.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
7 changes: 6 additions & 1 deletion game/main/ui/_theme/theme.tres
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
[gd_resource type="Theme" load_steps=24 format=3 uid="uid://co20v1mxv2dfm"]
[gd_resource type="Theme" load_steps=25 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"]
[ext_resource type="FontFile" uid="uid://b8lxwo5dkwrs4" path="res://main/ui/_theme/font/Poppins-Regular.ttf" id="1_p73bs"]
[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"]

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_dsk6v"]
bg_color = Color(0.223529, 0.215686, 0.278431, 0.321569)
Expand Down Expand Up @@ -128,8 +129,12 @@ CheckBox/styles/normal = SubResource("StyleBoxFlat_xa765")
CheckBox/styles/pressed = SubResource("StyleBoxFlat_us5ki")
CheckButton/icons/checked = ExtResource("1_coee0")
CheckButton/icons/unchecked = ExtResource("2_1j6w3")
ColorPicker/icons/sample_bg = ExtResource("5_vmfmg")
ColorPickerButton/icons/bg = ExtResource("5_vmfmg")
MenuButton/styles/hover = SubResource("StyleBoxFlat_11w6c")
OptionButton/font_sizes/font_size = 21
PopupMenu/colors/font_color = Color(1, 1, 1, 1)
PopupMenu/font_sizes/font_size = 21
PopupMenu/fonts/font = ExtResource("1_p73bs")
PopupMenu/icons/radio_checked = ExtResource("1_q36yb")
PopupMenu/icons/radio_unchecked = ExtResource("1_mvg4m")
Expand Down
2 changes: 1 addition & 1 deletion game/main/ui/element_selector/ElementSelector.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -1297,7 +1297,7 @@ corner_radius_bottom_right = 4
corner_radius_bottom_left = 4

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_bjwop"]
bg_color = Color(0.513726, 0.0745098, 0.341176, 1)
bg_color = Color(0.65098, 0.0980392, 0.0980392, 1)
corner_radius_top_left = 4
corner_radius_top_right = 4
corner_radius_bottom_right = 4
Expand Down
Binary file added game/main/ui/empty.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions game/main/ui/empty.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://du0y3fdwj5xc1"
path="res://.godot/imported/empty.png-709e18baf500e7e78bb77e0959694f40.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://main/ui/empty.png"
dest_files=["res://.godot/imported/empty.png-709e18baf500e7e78bb77e0959694f40.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
36 changes: 30 additions & 6 deletions game/main/ui/submenu/element_editor/ElementEditor.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ theme_override_styles/panel = SubResource("StyleBoxFlat_e160y")

[node name="VBoxContainer" type="VBoxContainer" parent="SettingsContainer/PanelContainer"]
layout_mode = 2
theme_override_constants/separation = 8
theme_override_constants/separation = 16

[node name="HBoxContainer" type="HBoxContainer" parent="SettingsContainer/PanelContainer/VBoxContainer"]
layout_mode = 2
Expand Down Expand Up @@ -284,7 +284,7 @@ vertical_scroll_mode = 2
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
theme_override_constants/separation = 8
theme_override_constants/separation = 11

[node name="AppearanceLabel" type="Label" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer"]
layout_mode = 2
Expand All @@ -298,12 +298,14 @@ theme_override_constants/separation = 8
[node name="Label" type="Label" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/NameGrouping"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 21
text = "name"

[node name="Name" type="LineEdit" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/NameGrouping"]
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 21
theme_override_styles/normal = SubResource("StyleBoxFlat_oid3n")
theme_override_styles/focus = SubResource("StyleBoxFlat_37g2l")
placeholder_text = "my_elem"
Expand All @@ -315,23 +317,25 @@ theme_override_constants/separation = 8
[node name="Label" type="Label" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/ColorStyleGrouping"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 21
text = "style"

[node name="Style" type="OptionButton" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/ColorStyleGrouping"]
unique_name_in_owner = true
custom_minimum_size = Vector2(150, 0)
layout_mode = 2
size_flags_horizontal = 3
focus_mode = 0
theme_override_constants/outline_size = 0
theme_override_font_sizes/font_size = 21
theme_override_styles/normal = SubResource("StyleBoxFlat_cu37i")
theme_override_styles/hover = SubResource("StyleBoxFlat_y3pxx")
theme_override_styles/pressed = SubResource("StyleBoxFlat_hm12v")
item_count = 2
selected = 0
popup/item_0/text = "flat color"
fit_to_longest_item = false
popup/item_0/text = "flat"
popup/item_0/id = 0
popup/item_1/text = "fancy color"
popup/item_1/text = "fancy"
popup/item_1/id = 1

[node name="FlatColorGrouping" type="HBoxContainer" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer"]
Expand All @@ -341,6 +345,7 @@ layout_mode = 2
[node name="Label" type="Label" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/FlatColorGrouping"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 21
text = "base color"

[node name="ColorA" type="ColorPickerButton" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/FlatColorGrouping" groups=["color_picker"]]
Expand All @@ -353,14 +358,15 @@ edit_alpha = false
[node name="FancyColorGrouping" type="VBoxContainer" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer"]
unique_name_in_owner = true
layout_mode = 2
theme_override_constants/separation = 8
theme_override_constants/separation = 11

[node name="BaseColor2" type="HBoxContainer" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/FancyColorGrouping"]
layout_mode = 2

[node name="Label" type="Label" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/FancyColorGrouping/BaseColor2"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 21
text = "base color 2"

[node name="ColorB" type="ColorPickerButton" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/FancyColorGrouping/BaseColor2" groups=["color_picker"]]
Expand All @@ -376,6 +382,7 @@ layout_mode = 2
[node name="Label" type="Label" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/FancyColorGrouping/OutlineColor"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 21
text = "outline color"

[node name="ColorC" type="ColorPickerButton" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/FancyColorGrouping/OutlineColor" groups=["color_picker"]]
Expand All @@ -396,13 +403,15 @@ layout_mode = 2
[node name="Label" type="Label" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/StateGrouping"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 21
text = "state"

[node name="State" type="OptionButton" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/StateGrouping"]
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 3
focus_mode = 0
theme_override_font_sizes/font_size = 21
theme_override_styles/normal = SubResource("StyleBoxFlat_cu37i")
theme_override_styles/hover = SubResource("StyleBoxFlat_y3pxx")
theme_override_styles/pressed = SubResource("StyleBoxFlat_hm12v")
Expand All @@ -426,6 +435,7 @@ layout_mode = 2
[node name="Label" type="Label" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/DensityGrouping"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 21
text = "density"

[node name="VBoxContainer" type="VBoxContainer" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/DensityGrouping"]
Expand Down Expand Up @@ -465,6 +475,7 @@ layout_mode = 2
[node name="Label" type="Label" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/ViscosityGrouping"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 21
text = "viscosity"

[node name="VBoxContainer" type="VBoxContainer" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/ViscosityGrouping"]
Expand Down Expand Up @@ -504,6 +515,7 @@ layout_mode = 2
[node name="Label" type="Label" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/PowerGrouping"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 21
text = "power"

[node name="VBoxContainer" type="VBoxContainer" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/PowerGrouping"]
Expand Down Expand Up @@ -543,6 +555,7 @@ layout_mode = 2
[node name="Label" type="Label" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/ConductivityGrouping"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 21
text = "conductivity"

[node name="VBoxContainer2" type="VBoxContainer" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/ConductivityGrouping"]
Expand Down Expand Up @@ -581,6 +594,7 @@ layout_mode = 2
[node name="Label" type="Label" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/TemperatureGrouping"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 21
text = "temperature"

[node name="VBoxContainer3" type="VBoxContainer" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/TemperatureGrouping"]
Expand Down Expand Up @@ -620,6 +634,7 @@ layout_mode = 2
[node name="Label" type="Label" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/FlammabilityGrouping"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 21
text = "flammability"

[node name="VBoxContainer4" type="VBoxContainer" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/FlammabilityGrouping"]
Expand Down Expand Up @@ -658,6 +673,7 @@ layout_mode = 2
[node name="Label" type="Label" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/ReactivityGrouping"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 21
text = "reactivity"

[node name="VBoxContainer5" type="VBoxContainer" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/ReactivityGrouping"]
Expand Down Expand Up @@ -697,6 +713,7 @@ layout_mode = 2
[node name="Label" type="Label" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/DurabilityGrouping"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 21
text = "durability"

[node name="VBoxContainer6" type="VBoxContainer" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/DurabilityGrouping"]
Expand Down Expand Up @@ -736,6 +753,7 @@ layout_mode = 2
[node name="Label" type="Label" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/AliveGrouping"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 21
text = "alive"

[node name="Alive" type="CheckButton" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/AliveGrouping"]
Expand All @@ -751,6 +769,7 @@ layout_mode = 2
[node name="Label" type="Label" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/AttractiveGrouping"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 21
text = "attractive"

[node name="Attractive" type="CheckButton" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/AttractiveGrouping"]
Expand All @@ -766,6 +785,7 @@ layout_mode = 2
[node name="Label" type="Label" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/EvaporableGrouping"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 21
text = "evaporable"

[node name="Evaporable" type="CheckButton" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/EvaporableGrouping"]
Expand All @@ -781,6 +801,7 @@ layout_mode = 2
[node name="Label" type="Label" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/ExplosiveGrouping"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 21
text = "explosive"

[node name="Explosive" type="CheckButton" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/ExplosiveGrouping"]
Expand All @@ -796,6 +817,7 @@ layout_mode = 2
[node name="Label" type="Label" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/InfectiousGrouping"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 21
text = "infectious"

[node name="Infectious" type="CheckButton" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/InfectiousGrouping"]
Expand All @@ -811,6 +833,7 @@ layout_mode = 2
[node name="Label" type="Label" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/PoisonousGrouping"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 21
text = "poisonous"

[node name="Toxic" type="CheckButton" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/PoisonousGrouping"]
Expand All @@ -826,6 +849,7 @@ layout_mode = 2
[node name="Label" type="Label" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/SolubleGrouping"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 21
text = "soluble"

[node name="Soluble" type="CheckButton" parent="SettingsContainer/PanelContainer/VBoxContainer/ScrollContainer/VBoxContainer/SolubleGrouping"]
Expand Down
Loading

0 comments on commit 56dc516

Please sign in to comment.