From 69bc0630667f285708ddbb74af8ef83f7a41fc23 Mon Sep 17 00:00:00 2001 From: tpart Date: Wed, 26 Jun 2024 16:08:38 +0200 Subject: Rewrite settings system; Add full controller support to settings; Add menu manager system --- client/menu/settings_menu.tscn | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'client/menu/settings_menu.tscn') diff --git a/client/menu/settings_menu.tscn b/client/menu/settings_menu.tscn index 18a32759..e1fefa47 100644 --- a/client/menu/settings_menu.tscn +++ b/client/menu/settings_menu.tscn @@ -1,9 +1,7 @@ -[gd_scene load_steps=5 format=3 uid="uid://8ic77jmadadj"] +[gd_scene load_steps=3 format=3 uid="uid://8ic77jmadadj"] [ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme.tres" id="1_foq3a"] -[ext_resource type="PackedScene" uid="uid://l4vm07dtda4j" path="res://menu/menu_background.tscn" id="1_wi8ti"] [ext_resource type="Script" path="res://menu/settings_menu.gd" id="2_3hgm8"] -[ext_resource type="PackedScene" uid="uid://bg2d78ycorcqk" path="res://menu/scene_transition.tscn" id="2_t0one"] [node name="SettingsMenu" type="Control"] layout_mode = 3 @@ -15,8 +13,6 @@ grow_vertical = 2 theme = ExtResource("1_foq3a") script = ExtResource("2_3hgm8") -[node name="MenuBackground" parent="." instance=ExtResource("1_wi8ti")] - [node name="outer_gap" type="MarginContainer" parent="."] layout_mode = 1 anchors_preset = 15 @@ -58,8 +54,4 @@ layout_mode = 2 size_flags_vertical = 8 text = "Back to Main Menu" -[node name="SceneTransition" parent="." instance=ExtResource("2_t0one")] -visible = false -layout_mode = 1 - [connection signal="pressed" from="outer_gap/panel/inner_gap/back" to="." method="_on_back_pressed"] -- cgit v1.2.3-70-g09d2 From 8dfe99686938995c9d1d8ff4499fab31ef61681a Mon Sep 17 00:00:00 2001 From: tpart Date: Wed, 26 Jun 2024 16:22:10 +0200 Subject: Improve focus style to make it more visible and accessible --- client/menu/character_menu.tscn | 2 +- client/menu/credits_menu.tscn | 2 +- client/menu/error_menu.tscn | 2 +- client/menu/font-josefin-sans.woff2 | Bin 47448 -> 0 bytes client/menu/font-josefin-sans.woff2.import | 33 ----------- client/menu/font-sansita-swashed.woff2 | Bin 92808 -> 0 bytes client/menu/font-sansita-swashed.woff2.import | 33 ----------- client/menu/ingame_menu.tscn | 4 +- client/menu/main_menu.tscn | 4 +- client/menu/settings_menu.tscn | 2 +- client/menu/theme.tres | 63 -------------------- client/menu/theme/focus_style.tres | 17 ++++++ client/menu/theme/font-josefin-sans.woff2 | Bin 0 -> 47448 bytes client/menu/theme/font-josefin-sans.woff2.import | 33 +++++++++++ client/menu/theme/font-sansita-swashed.woff2 | Bin 0 -> 92808 bytes .../menu/theme/font-sansita-swashed.woff2.import | 33 +++++++++++ client/menu/theme/theme.tres | 64 +++++++++++++++++++++ client/player/chat_message.tscn | 2 +- 18 files changed, 156 insertions(+), 138 deletions(-) delete mode 100644 client/menu/font-josefin-sans.woff2 delete mode 100644 client/menu/font-josefin-sans.woff2.import delete mode 100644 client/menu/font-sansita-swashed.woff2 delete mode 100644 client/menu/font-sansita-swashed.woff2.import delete mode 100644 client/menu/theme.tres create mode 100644 client/menu/theme/focus_style.tres create mode 100644 client/menu/theme/font-josefin-sans.woff2 create mode 100644 client/menu/theme/font-josefin-sans.woff2.import create mode 100644 client/menu/theme/font-sansita-swashed.woff2 create mode 100644 client/menu/theme/font-sansita-swashed.woff2.import create mode 100644 client/menu/theme/theme.tres (limited to 'client/menu/settings_menu.tscn') diff --git a/client/menu/character_menu.tscn b/client/menu/character_menu.tscn index cad0cb35..b958cf9d 100644 --- a/client/menu/character_menu.tscn +++ b/client/menu/character_menu.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=7 format=3 uid="uid://1f7xpirm5d28"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme.tres" id="1_ak2pw"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_ak2pw"] [ext_resource type="Script" path="res://menu/character_menu.gd" id="1_brhd1"] [ext_resource type="PackedScene" uid="uid://b3hhir2fvnunu" path="res://player/character/character.tscn" id="3_odq7n"] [ext_resource type="PackedScene" uid="uid://bg2d78ycorcqk" path="res://menu/scene_transition.tscn" id="4_c0ocf"] diff --git a/client/menu/credits_menu.tscn b/client/menu/credits_menu.tscn index 372664d4..74d5cbc9 100644 --- a/client/menu/credits_menu.tscn +++ b/client/menu/credits_menu.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=3 uid="uid://7mqbxa054bjv"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme.tres" id="1_emk5o"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_emk5o"] [ext_resource type="Script" path="res://menu/credits_menu.gd" id="1_igs63"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_p2qmw"] diff --git a/client/menu/error_menu.tscn b/client/menu/error_menu.tscn index 0b86cceb..ea01ddc3 100644 --- a/client/menu/error_menu.tscn +++ b/client/menu/error_menu.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://cimgn07lbcs4v"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme.tres" id="1_cabdu"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_cabdu"] [ext_resource type="PackedScene" uid="uid://l4vm07dtda4j" path="res://menu/menu_background.tscn" id="2_5fxol"] [ext_resource type="Script" path="res://menu/error_menu.gd" id="2_dbe41"] [ext_resource type="PackedScene" uid="uid://bg2d78ycorcqk" path="res://menu/scene_transition.tscn" id="4_1nbt3"] diff --git a/client/menu/font-josefin-sans.woff2 b/client/menu/font-josefin-sans.woff2 deleted file mode 100644 index dce2708f..00000000 Binary files a/client/menu/font-josefin-sans.woff2 and /dev/null differ diff --git a/client/menu/font-josefin-sans.woff2.import b/client/menu/font-josefin-sans.woff2.import deleted file mode 100644 index 9bf40c47..00000000 --- a/client/menu/font-josefin-sans.woff2.import +++ /dev/null @@ -1,33 +0,0 @@ -[remap] - -importer="font_data_dynamic" -type="FontFile" -uid="uid://5ixo6b3bd3km" -path="res://.godot/imported/font-josefin-sans.woff2-8195d19f9e478a66f9d2ca31db663e15.fontdata" - -[deps] - -source_file="res://menu/font-josefin-sans.woff2" -dest_files=["res://.godot/imported/font-josefin-sans.woff2-8195d19f9e478a66f9d2ca31db663e15.fontdata"] - -[params] - -Rendering=null -antialiasing=1 -generate_mipmaps=false -multichannel_signed_distance_field=false -msdf_pixel_range=8 -msdf_size=48 -allow_system_fallback=true -force_autohinter=false -hinting=1 -subpixel_positioning=1 -oversampling=0.0 -Fallbacks=null -fallbacks=[] -Compress=null -compress=true -preload=[] -language_support={} -script_support={} -opentype_features={} diff --git a/client/menu/font-sansita-swashed.woff2 b/client/menu/font-sansita-swashed.woff2 deleted file mode 100644 index 5c665fb0..00000000 Binary files a/client/menu/font-sansita-swashed.woff2 and /dev/null differ diff --git a/client/menu/font-sansita-swashed.woff2.import b/client/menu/font-sansita-swashed.woff2.import deleted file mode 100644 index 54056a3c..00000000 --- a/client/menu/font-sansita-swashed.woff2.import +++ /dev/null @@ -1,33 +0,0 @@ -[remap] - -importer="font_data_dynamic" -type="FontFile" -uid="uid://bo4vh5xkpvrh1" -path="res://.godot/imported/font-sansita-swashed.woff2-259623c6db3c7be991207ff769c643a5.fontdata" - -[deps] - -source_file="res://menu/font-sansita-swashed.woff2" -dest_files=["res://.godot/imported/font-sansita-swashed.woff2-259623c6db3c7be991207ff769c643a5.fontdata"] - -[params] - -Rendering=null -antialiasing=1 -generate_mipmaps=false -multichannel_signed_distance_field=false -msdf_pixel_range=8 -msdf_size=48 -allow_system_fallback=true -force_autohinter=false -hinting=1 -subpixel_positioning=1 -oversampling=0.0 -Fallbacks=null -fallbacks=[] -Compress=null -compress=true -preload=[] -language_support={} -script_support={} -opentype_features={} diff --git a/client/menu/ingame_menu.tscn b/client/menu/ingame_menu.tscn index 920c8724..cfd6ebba 100644 --- a/client/menu/ingame_menu.tscn +++ b/client/menu/ingame_menu.tscn @@ -2,8 +2,8 @@ [ext_resource type="Script" path="res://menu/ingame_menu.gd" id="1_gd1i3"] [ext_resource type="Shader" path="res://menu/blur_mix.gdshader" id="1_o42mc"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme.tres" id="1_tm331"] -[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/font-sansita-swashed.woff2" id="2_4u0ox"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_tm331"] +[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="2_4u0ox"] [sub_resource type="Animation" id="Animation_8sedy"] length = 0.001 diff --git a/client/menu/main_menu.tscn b/client/menu/main_menu.tscn index 7bd1ccc3..76b55a1a 100644 --- a/client/menu/main_menu.tscn +++ b/client/menu/main_menu.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=8 format=3 uid="uid://dbj8508whxgwv"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme.tres" id="1_nlcpo"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_nlcpo"] [ext_resource type="Script" path="res://menu/main_menu.gd" id="2_qot2j"] [ext_resource type="Shader" path="res://menu/blur_mix.gdshader" id="4_050xu"] -[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/font-sansita-swashed.woff2" id="4_mfs30"] +[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="4_mfs30"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_irdo3"] shader = ExtResource("4_050xu") diff --git a/client/menu/settings_menu.tscn b/client/menu/settings_menu.tscn index e1fefa47..6ead9b8b 100644 --- a/client/menu/settings_menu.tscn +++ b/client/menu/settings_menu.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://8ic77jmadadj"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme.tres" id="1_foq3a"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_foq3a"] [ext_resource type="Script" path="res://menu/settings_menu.gd" id="2_3hgm8"] [node name="SettingsMenu" type="Control"] diff --git a/client/menu/theme.tres b/client/menu/theme.tres deleted file mode 100644 index c2ec3b12..00000000 --- a/client/menu/theme.tres +++ /dev/null @@ -1,63 +0,0 @@ -[gd_resource type="Theme" load_steps=8 format=3 uid="uid://b0qmvo504e457"] - -[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/font-josefin-sans.woff2" id="1_go7fi"] -[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/font-sansita-swashed.woff2" id="1_tneco"] - -[sub_resource type="FontVariation" id="FontVariation_lyo8w"] -base_font = ExtResource("1_go7fi") -variation_embolden = 1.25 -spacing_top = 5 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_25x32"] -content_margin_left = 10.0 -content_margin_top = 10.0 -content_margin_right = 10.0 -content_margin_bottom = 10.0 -bg_color = Color(1, 1, 1, 0.0352941) -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="StyleBoxFlat_2fl8q"] -content_margin_left = 10.0 -content_margin_top = 10.0 -content_margin_right = 10.0 -content_margin_bottom = 10.0 -bg_color = Color(1, 1, 1, 0.266667) -corner_radius_top_left = 5 -corner_radius_top_right = 5 -corner_radius_bottom_right = 5 -corner_radius_bottom_left = 5 - -[sub_resource type="StyleBoxLine" id="StyleBoxLine_emtvk"] -content_margin_top = 5.0 -content_margin_bottom = 5.0 -color = Color(1, 1, 1, 1) -grow_begin = 0.0 -grow_end = 0.0 -thickness = 3 - -[sub_resource type="FontVariation" id="FontVariation_ff4nr"] -base_font = ExtResource("1_tneco") -variation_embolden = 0.7 - -[resource] -Button/font_sizes/font_size = 18 -Button/fonts/font = SubResource("FontVariation_lyo8w") -Button/styles/disabled = SubResource("StyleBoxFlat_25x32") -Button/styles/focus = SubResource("StyleBoxFlat_25x32") -Button/styles/hover = SubResource("StyleBoxFlat_2fl8q") -Button/styles/normal = SubResource("StyleBoxFlat_25x32") -Button/styles/pressed = SubResource("StyleBoxFlat_25x32") -HSeparator/styles/separator = SubResource("StyleBoxLine_emtvk") -Label/font_sizes/font_size = 16 -Label/fonts/font = ExtResource("1_tneco") -LineEdit/styles/focus = SubResource("StyleBoxFlat_25x32") -LineEdit/styles/normal = SubResource("StyleBoxFlat_25x32") -LineEdit/styles/read_only = SubResource("StyleBoxFlat_25x32") -RichTextLabel/fonts/bold_font = SubResource("FontVariation_ff4nr") -RichTextLabel/fonts/bold_italics_font = null -RichTextLabel/fonts/italics_font = null -RichTextLabel/fonts/mono_font = null -RichTextLabel/fonts/normal_font = ExtResource("1_tneco") diff --git a/client/menu/theme/focus_style.tres b/client/menu/theme/focus_style.tres new file mode 100644 index 00000000..a01843fe --- /dev/null +++ b/client/menu/theme/focus_style.tres @@ -0,0 +1,17 @@ +[gd_resource type="StyleBoxFlat" format=3 uid="uid://b86kbd3pfkd5w"] + +[resource] +content_margin_left = 10.0 +content_margin_top = 10.0 +content_margin_right = 10.0 +content_margin_bottom = 10.0 +bg_color = Color(1, 1, 1, 0.0627451) +border_width_left = 2 +border_width_top = 2 +border_width_right = 2 +border_width_bottom = 2 +border_color = Color(0.818673, 0.926505, 1, 1) +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 diff --git a/client/menu/theme/font-josefin-sans.woff2 b/client/menu/theme/font-josefin-sans.woff2 new file mode 100644 index 00000000..dce2708f Binary files /dev/null and b/client/menu/theme/font-josefin-sans.woff2 differ diff --git a/client/menu/theme/font-josefin-sans.woff2.import b/client/menu/theme/font-josefin-sans.woff2.import new file mode 100644 index 00000000..5ecd872c --- /dev/null +++ b/client/menu/theme/font-josefin-sans.woff2.import @@ -0,0 +1,33 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://5ixo6b3bd3km" +path="res://.godot/imported/font-josefin-sans.woff2-e2c3f263d98e1132cfe6af3f4f0a3454.fontdata" + +[deps] + +source_file="res://menu/theme/font-josefin-sans.woff2" +dest_files=["res://.godot/imported/font-josefin-sans.woff2-e2c3f263d98e1132cfe6af3f4f0a3454.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/client/menu/theme/font-sansita-swashed.woff2 b/client/menu/theme/font-sansita-swashed.woff2 new file mode 100644 index 00000000..5c665fb0 Binary files /dev/null and b/client/menu/theme/font-sansita-swashed.woff2 differ diff --git a/client/menu/theme/font-sansita-swashed.woff2.import b/client/menu/theme/font-sansita-swashed.woff2.import new file mode 100644 index 00000000..faf840fa --- /dev/null +++ b/client/menu/theme/font-sansita-swashed.woff2.import @@ -0,0 +1,33 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://bo4vh5xkpvrh1" +path="res://.godot/imported/font-sansita-swashed.woff2-323b4a2ee0671aba6e17a6f073f706f3.fontdata" + +[deps] + +source_file="res://menu/theme/font-sansita-swashed.woff2" +dest_files=["res://.godot/imported/font-sansita-swashed.woff2-323b4a2ee0671aba6e17a6f073f706f3.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/client/menu/theme/theme.tres b/client/menu/theme/theme.tres new file mode 100644 index 00000000..96cdbb19 --- /dev/null +++ b/client/menu/theme/theme.tres @@ -0,0 +1,64 @@ +[gd_resource type="Theme" load_steps=9 format=3 uid="uid://b0qmvo504e457"] + +[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/font-josefin-sans.woff2" id="1_f8qb0"] +[ext_resource type="StyleBox" uid="uid://b86kbd3pfkd5w" path="res://menu/theme/focus_style.tres" id="2_brg2c"] +[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="3_8u6ww"] + +[sub_resource type="FontVariation" id="FontVariation_lyo8w"] +base_font = ExtResource("1_f8qb0") +variation_embolden = 1.25 +spacing_top = 5 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_25x32"] +content_margin_left = 10.0 +content_margin_top = 10.0 +content_margin_right = 10.0 +content_margin_bottom = 10.0 +bg_color = Color(1, 1, 1, 0.0352941) +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="StyleBoxFlat_2fl8q"] +content_margin_left = 10.0 +content_margin_top = 10.0 +content_margin_right = 10.0 +content_margin_bottom = 10.0 +bg_color = Color(1, 1, 1, 0.266667) +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 + +[sub_resource type="StyleBoxLine" id="StyleBoxLine_emtvk"] +content_margin_top = 5.0 +content_margin_bottom = 5.0 +color = Color(1, 1, 1, 1) +grow_begin = 0.0 +grow_end = 0.0 +thickness = 3 + +[sub_resource type="FontVariation" id="FontVariation_ff4nr"] +base_font = ExtResource("3_8u6ww") +variation_embolden = 0.7 + +[resource] +Button/font_sizes/font_size = 18 +Button/fonts/font = SubResource("FontVariation_lyo8w") +Button/styles/disabled = SubResource("StyleBoxFlat_25x32") +Button/styles/focus = ExtResource("2_brg2c") +Button/styles/hover = SubResource("StyleBoxFlat_2fl8q") +Button/styles/normal = SubResource("StyleBoxFlat_25x32") +Button/styles/pressed = SubResource("StyleBoxFlat_25x32") +HSeparator/styles/separator = SubResource("StyleBoxLine_emtvk") +Label/font_sizes/font_size = 16 +Label/fonts/font = ExtResource("3_8u6ww") +LineEdit/styles/focus = ExtResource("2_brg2c") +LineEdit/styles/normal = SubResource("StyleBoxFlat_25x32") +LineEdit/styles/read_only = SubResource("StyleBoxFlat_25x32") +RichTextLabel/fonts/bold_font = SubResource("FontVariation_ff4nr") +RichTextLabel/fonts/bold_italics_font = null +RichTextLabel/fonts/italics_font = null +RichTextLabel/fonts/mono_font = null +RichTextLabel/fonts/normal_font = ExtResource("3_8u6ww") diff --git a/client/player/chat_message.tscn b/client/player/chat_message.tscn index 1ac82368..816c9c4f 100644 --- a/client/player/chat_message.tscn +++ b/client/player/chat_message.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=3 uid="uid://5rcfoyuiwuya"] -[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/font-josefin-sans.woff2" id="1_3ximm"] +[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/font-josefin-sans.woff2" id="1_3ximm"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_dpele"] bg_color = Color(1, 1, 1, 1) -- cgit v1.2.3-70-g09d2