From 8ca53f8687a463011b90a6d6f2acededc342d6c6 Mon Sep 17 00:00:00 2001 From: yannk Date: Sat, 16 Apr 2022 19:03:44 +0200 Subject: [PATCH] Adding a proper UI panel for dev panel, with original background --- scenes/developper/developper.gd | 2 +- scenes/developper/developper.tscn | 102 +++++++++++++++---- scenes/hud/hud.gd | 3 +- scenes/hud/hud.tscn | 8 +- scenes/themes/textures/base_panel.png | Bin 0 -> 1759 bytes scenes/themes/textures/base_panel.png.import | 33 ++++++ 6 files changed, 118 insertions(+), 30 deletions(-) create mode 100644 scenes/themes/textures/base_panel.png create mode 100644 scenes/themes/textures/base_panel.png.import diff --git a/scenes/developper/developper.gd b/scenes/developper/developper.gd index 3b6c092..127f5d5 100644 --- a/scenes/developper/developper.gd +++ b/scenes/developper/developper.gd @@ -11,4 +11,4 @@ func _process(delta): pass func _on_quit_pressed(): - $Window.visible = false + get_node("../developper_panel").visible = false diff --git a/scenes/developper/developper.tscn b/scenes/developper/developper.tscn index 6d6d37c..bcdf2a1 100644 --- a/scenes/developper/developper.tscn +++ b/scenes/developper/developper.tscn @@ -1,43 +1,101 @@ -[gd_scene load_steps=2 format=3 uid="uid://cua4782cbjhla"] +[gd_scene load_steps=4 format=3 uid="uid://cua4782cbjhla"] [ext_resource type="Script" path="res://scenes/developper/developper.gd" id="1_qf0rd"] +[ext_resource type="Texture2D" uid="uid://se0t5xwdxyq7" path="res://scenes/themes/textures/base_panel.png" id="2_fmcto"] +[ext_resource type="Theme" uid="uid://bi1js53ni6ehd" path="res://UI/themes/khanat/khanat.theme" id="3_ols6l"] -[node name="Control" type="Control"] -script = ExtResource( "1_qf0rd" ) - -[node name="Window" type="Window" parent="."] -title = "win_developper" +[node name="developper_panel" type="Control"] visible = false +minimum_size = Vector2(350, 250) +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -175.0 +offset_top = -125.0 +offset_right = 175.0 +offset_bottom = 125.0 +grow_horizontal = 2 +grow_vertical = 2 +script = ExtResource( "1_qf0rd" ) +metadata/_edit_use_custom_anchors = false -[node name="VBoxContainer" type="VBoxContainer" parent="Window"] +[node name="NinePatchRect" type="NinePatchRect" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 +texture = ExtResource( "2_fmcto" ) +patch_margin_left = 50 +patch_margin_top = 10 +patch_margin_right = 25 +patch_margin_bottom = 25 +axis_stretch_horizontal = 2 +axis_stretch_vertical = 2 +metadata/_edit_layout_mode = 1 +metadata/_edit_use_custom_anchors = false + +[node name="header" type="VBoxContainer" parent="."] +offset_left = 50.0 +offset_top = 4.0 +offset_right = 347.0 +offset_bottom = 31.0 +metadata/_edit_layout_mode = 0 +metadata/_edit_use_custom_anchors = false + +[node name="Label" type="Label" parent="header"] +offset_top = -1.0 +offset_right = 297.0 +offset_bottom = 26.4 +theme = ExtResource( "3_ols6l" ) +text = "win_developper" + +[node name="main" type="VBoxContainer" parent="."] +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = 5.0 +offset_top = 33.0 +offset_right = -17.0 +offset_bottom = -11.0 +grow_horizontal = 2 +grow_vertical = 2 size_flags_horizontal = 3 size_flags_vertical = 3 metadata/_edit_use_custom_anchors = false +metadata/_edit_layout_mode = 1 -[node name="VBoxContainer2" type="VBoxContainer" parent="Window/VBoxContainer"] -offset_right = 40.0 -offset_bottom = 40.0 +[node name="VBoxContainer2" type="VBoxContainer" parent="main"] +offset_right = 328.0 +offset_bottom = 27.0 +size_flags_vertical = 0 -[node name="TabBar" type="TabBar" parent="Window/VBoxContainer/VBoxContainer2"] -anchor_right = 1.0 -anchor_bottom = 1.0 -offset_top = 31.0 -offset_bottom = 22.0 +[node name="TabBar" type="TabBar" parent="main/VBoxContainer2"] +offset_right = 328.0 +offset_bottom = 27.0 +theme = ExtResource( "3_ols6l" ) tab_count = 2 tab_0/title = "tab_sky" tab_1/title = "tab_weather" -[node name="Quit" type="Button" parent="Window/VBoxContainer"] -offset_top = 35.0 -offset_right = 43.0 -offset_bottom = 66.0 +[node name="footer" type="VBoxContainer" parent="."] +minimum_size = Vector2(0, 30) +offset_left = 3.0 +offset_top = 213.0 +offset_right = 347.0 +offset_bottom = 247.0 +size_flags_vertical = 10 +metadata/_edit_layout_mode = 0 +metadata/_edit_use_custom_anchors = false + +[node name="Quit" type="Button" parent="footer"] +minimum_size = Vector2(75, 0) +offset_left = 134.0 +offset_top = 7.0 +offset_right = 209.0 +offset_bottom = 26.0 size_flags_horizontal = 4 -size_flags_vertical = 8 +size_flags_vertical = 6 +theme = ExtResource( "3_ols6l" ) text = "Quit" -[connection signal="close_requested" from="Window" to="." method="_on_quit_pressed"] -[connection signal="pressed" from="Window/VBoxContainer/Quit" to="." method="_on_quit_pressed"] +[connection signal="pressed" from="footer/Quit" to="." method="_on_quit_pressed"] diff --git a/scenes/hud/hud.gd b/scenes/hud/hud.gd index 38e2be2..19368f6 100644 --- a/scenes/hud/hud.gd +++ b/scenes/hud/hud.gd @@ -67,8 +67,7 @@ func _on_themes_pressed(): $MenuTheme/Window.visible = true func _on_dev_pressed(): - $MenuDev/Window.popup_centered() - $MenuDev/Window.visible = true + $developper_panel.visible = true func _on_about_pressed(): var aboutmessage:String diff --git a/scenes/hud/hud.tscn b/scenes/hud/hud.tscn index 1372df2..4841d2e 100644 --- a/scenes/hud/hud.tscn +++ b/scenes/hud/hud.tscn @@ -15,6 +15,7 @@ theme = ExtResource( "1_iq3fo" ) script = ExtResource( "1_s6f6d" ) [node name="Message" type="HBoxContainer" parent="."] +visible = false anchor_right = 1.0 size_flags_horizontal = 0 size_flags_vertical = 0 @@ -28,6 +29,7 @@ size_flags_vertical = 1 text = "Echap = Menu" [node name="Menu" type="HBoxContainer" parent="."] +visible = false anchor_right = 1.0 offset_right = 40.0 offset_bottom = 40.0 @@ -98,11 +100,7 @@ visible = false [node name="MusicManager" parent="." instance=ExtResource( "6_0ivsi" )] visible = false -[node name="MenuDev" parent="." instance=ExtResource( "7_45giw" )] -offset_left = 174.0 -offset_top = 4.0 -offset_right = 174.0 -offset_bottom = 4.0 +[node name="developper_panel" parent="." instance=ExtResource( "7_45giw" )] [connection signal="pressed" from="Menu/Keys" to="." method="_on_keys_pressed"] [connection signal="pressed" from="Menu/Themes" to="." method="_on_themes_pressed"] diff --git a/scenes/themes/textures/base_panel.png b/scenes/themes/textures/base_panel.png new file mode 100644 index 0000000000000000000000000000000000000000..97af4cd37978537bf8f85232bd646e2e957a110b GIT binary patch literal 1759 zcmeH|>r>Ks6vn?Ki)L%4UCflN+$ndqiP*|)w?x}=&@yj{H)6oCpu$82`bm!9=$e|Y zJ3G7PB`-CNn}Q;ak{3WQ?5eA7ikg9VDKyQWmqrj3SoW{jH@$e~dFFgxoik_V$qNm} zJJ|2B2LLz(2Am5A0AY;?V285W<&+w#)ix&u#4rKas{Bug7mS)K)}brQKbm!kL1jU4 zDOUjmL73}_bY^^9(p3y2g?1l4y$1kPLg2YG5vk?#>X2L#5 z={F#ZxVyzAGaxL~`TU7OQiQW-_Y=GCquo7rvE#x*UpD7scI&BRHh4A3`_|wT@2|vek>9S&F z&N~f3`5e@+lHXU6YP7jT;&ljM*r z_OC6rg4rAT{=Dw0-Os`mSL*B(o!L=vEk8u7s1vs9vy4XFQ;!6vDD;rhlbjkwzNyLQ z(CK?Q+`dVf67yBia{^-3Fz3yyCTLC!b_v&E8h3Sc{Z1Jos4E5FEHj5BL_tF#MF$(C z>twQ9r#q$Ro(-0i#fVe|m{VH#wvLvW<(}`Th^f!L#EhXTH_ZtA6y3mGT%OS(rbO-; zo^t6ri(sN6j}gVN*=S6}X2vLXlh{s4*lUgvsyA30qPVKO^4*F$l!(}#OaR>EgueXx z_U!#SnfQ^I@pYSZ+e5hKrbqJSQ1;5G!$tbaVr`quC1=dOBzGs`B>VkYUi}%gcIH7O zJGmD1TLJYj#W~V60&6kz=45fZs4+~FMVr=lc-^hecopph`g)-Y^(xb_?_WNUZbs;d z7w^Ej(z#O$J&mQ09dYfe+3kfqyQ4E}H2&P^wJ4kC^JQeC50j;%{Sk{SIZf7NQwD5Z zFg{+e=SO}b+Q0;E-WmdApdLXa6n>xsm#Q`MNY$s;ZXJ7(mXLcki@GX{s5A}SSNQwc z9R%Bgz`hdThec#iHi1qg$lMH&+rby`pGdw8n<<2E&Q7s`1y@#T!Li%yxNDuCZ z7AO$x>we{PN?Vz38cKuGSr!-HkB7nglWnx=cTE=QO}&nbub5j)lmovzAC&UrD&GMD zx+cYGn{(amRRIz_k$5@sih$zQt-qDz13*NoPg@o6)u>