Skip to content

Commit

Permalink
Minor UI tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
kiwijuice56 committed Jul 8, 2024
1 parent 79b3e49 commit 6c0e0f1
Show file tree
Hide file tree
Showing 11 changed files with 916 additions and 866 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build/*
godot-cpp/*
game/android/*
android_project/*
release/*
game/release/*

# private export files
*.cfg
Expand Down
6 changes: 3 additions & 3 deletions game/export_presets.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -540,13 +540,13 @@ debug/export_console_script=1
name="Web"
platform="Web"
runnable=true
advanced_options=false
advanced_options=true
dedicated_server=false
custom_features=""
export_filter="all_resources"
include_filter=""
exclude_filter=""
export_path="../release/web/test.html"
export_path="release/web_build/index.html"
encryption_include_filters=""
encryption_exclude_filters=""
encrypt_pck=false
Expand All @@ -558,7 +558,7 @@ script_export_mode=2
custom_template/debug=""
custom_template/release=""
variant/extensions_support=true
variant/thread_support=false
variant/thread_support=true
vram_texture_compression/for_desktop=true
vram_texture_compression/for_mobile=false
html/export_icon=true
Expand Down
6 changes: 2 additions & 4 deletions game/main/Main.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,10 @@ _data = {
[sub_resource type="Environment" id="Environment_6bfny"]
background_mode = 3
glow_enabled = true
glow_intensity = 1.2
glow_intensity = 1.3
glow_strength = 1.1
glow_bloom = 0.3
glow_bloom = 0.41
glow_hdr_threshold = 0.8
glow_hdr_scale = 3.61

[node name="Main" type="Node"]
script = ExtResource("1_2pidp")
Expand Down Expand Up @@ -293,7 +292,6 @@ icon_alignment = 1
unique_name_in_owner = true
custom_minimum_size = Vector2(0, 128)
layout_mode = 2
current_tab = 0
simulation = NodePath("../../../../../../..")
eraser_button = NodePath("../ButtonRow/Eraser")
tap_button = NodePath("../ButtonRow/Tap")
Expand Down
20 changes: 19 additions & 1 deletion game/main/ui/_theme/theme.tres
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_resource type="Theme" load_steps=25 format=3 uid="uid://co20v1mxv2dfm"]
[gd_resource type="Theme" load_steps=26 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"]
Expand All @@ -20,6 +20,7 @@ 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_xa765"]
bg_color = Color(0.313726, 0.313726, 0.360784, 1)
Expand All @@ -35,6 +36,12 @@ corner_radius_top_right = 4
corner_radius_bottom_right = 4
corner_radius_bottom_left = 4

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_e4p0n"]
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_jpob4"]
content_margin_left = 4.0
content_margin_top = 4.0
Expand All @@ -46,6 +53,7 @@ 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="StyleBoxEmpty" id="StyleBoxEmpty_trow7"]

Expand All @@ -56,26 +64,31 @@ corner_radius_bottom_left = 4
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_f1olk"]

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_1m6tb"]
anti_aliasing = false

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_en2fd"]
corner_radius_top_left = 4
corner_radius_top_right = 4
anti_aliasing = false

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_swmfl"]
corner_radius_top_left = 4
corner_radius_top_right = 4
anti_aliasing = false

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_51o40"]
content_margin_left = 6.0
content_margin_right = 6.0
bg_color = Color(0.407843, 0.411765, 0.466667, 1)
anti_aliasing = false

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_tp6yl"]
content_margin_left = 6.0
content_margin_right = 6.0
bg_color = Color(0.407843, 0.411765, 0.466667, 1)
corner_radius_top_left = 4
corner_radius_top_right = 4
anti_aliasing = false

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ryi16"]
content_margin_left = 6.0
Expand All @@ -85,6 +98,7 @@ content_margin_bottom = 4.0
bg_color = Color(0.313726, 0.313726, 0.360784, 1)
corner_radius_top_left = 4
corner_radius_top_right = 4
anti_aliasing = false

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_cuddc"]
content_margin_left = 6.0
Expand All @@ -94,13 +108,15 @@ content_margin_bottom = 2.0
bg_color = Color(0.223529, 0.215686, 0.278431, 1)
corner_radius_top_left = 4
corner_radius_top_right = 4
anti_aliasing = false

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_xyiyu"]
bg_color = Color(1, 1, 1, 1)
corner_radius_top_left = 6
corner_radius_top_right = 6
corner_radius_bottom_right = 6
corner_radius_bottom_left = 6
anti_aliasing = false

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_6vkpo"]
content_margin_left = 32.0
Expand All @@ -109,6 +125,7 @@ corner_radius_top_left = 4
corner_radius_top_right = 4
corner_radius_bottom_right = 4
corner_radius_bottom_left = 4
anti_aliasing = false

[resource]
default_font = ExtResource("1_p73bs")
Expand All @@ -131,6 +148,7 @@ 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")
ColorPickerButton/styles/normal = SubResource("StyleBoxFlat_e4p0n")
MenuButton/styles/hover = SubResource("StyleBoxFlat_11w6c")
OptionButton/font_sizes/font_size = 21
PopupMenu/colors/font_color = Color(1, 1, 1, 1)
Expand Down
Loading

0 comments on commit 6c0e0f1

Please sign in to comment.