From 066b8ddcaaa8f06e61208893081f8ff493d1d762 Mon Sep 17 00:00:00 2001 From: Pawel Lampe Date: Mon, 25 Mar 2024 20:11:50 +0100 Subject: [PATCH] Make main menu larger, closes #65 --- source/main-menu/Credits.tscn | 10 ++++++- source/main-menu/Loading.tscn | 1 + source/main-menu/Options.tscn | 48 +++++++++++++++++++++++++------ source/main-menu/Play.tscn | 17 ++++++----- source/resources/main_menu.theme | Bin 738 -> 898 bytes 5 files changed, 58 insertions(+), 18 deletions(-) diff --git a/source/main-menu/Credits.tscn b/source/main-menu/Credits.tscn index d8bb38e..0cf87be 100644 --- a/source/main-menu/Credits.tscn +++ b/source/main-menu/Credits.tscn @@ -48,7 +48,15 @@ alignment = 1 layout_mode = 2 size_flags_vertical = 3 -[node name="RichTextLabel" type="RichTextLabel" parent="PanelContainer/MarginContainer/VBoxContainer"] +[node name="PanelContainer" type="PanelContainer" parent="PanelContainer/MarginContainer/VBoxContainer"] +layout_mode = 2 + +[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/MarginContainer/VBoxContainer/PanelContainer"] +layout_mode = 2 +theme_override_constants/margin_top = 15 +theme_override_constants/margin_bottom = 15 + +[node name="RichTextLabel" type="RichTextLabel" parent="PanelContainer/MarginContainer/VBoxContainer/PanelContainer/MarginContainer"] layout_mode = 2 theme_override_font_sizes/normal_font_size = 20 bbcode_enabled = true diff --git a/source/main-menu/Loading.tscn b/source/main-menu/Loading.tscn index b1c6b23..b6b08ef 100644 --- a/source/main-menu/Loading.tscn +++ b/source/main-menu/Loading.tscn @@ -43,6 +43,7 @@ offset_right = 200.0 grow_horizontal = 2 grow_vertical = 0 theme_override_colors/font_shadow_color = Color(0, 0, 0, 1) +theme_override_font_sizes/font_size = 20 text = "loading" horizontal_alignment = 1 vertical_alignment = 1 diff --git a/source/main-menu/Options.tscn b/source/main-menu/Options.tscn index f94efd1..a23aa02 100644 --- a/source/main-menu/Options.tscn +++ b/source/main-menu/Options.tscn @@ -47,15 +47,31 @@ alignment = 1 [node name="PanelContainer" type="PanelContainer" parent="PanelContainer/MarginContainer/VBoxContainer"] layout_mode = 2 -[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer/PanelContainer"] +[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/MarginContainer/VBoxContainer/PanelContainer"] layout_mode = 2 +theme_override_constants/margin_left = 5 +theme_override_constants/margin_top = 5 +theme_override_constants/margin_right = 5 +theme_override_constants/margin_bottom = 5 -[node name="Label" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer/PanelContainer/VBoxContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer/PanelContainer/MarginContainer"] +layout_mode = 2 + +[node name="Label" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer/PanelContainer/MarginContainer/VBoxContainer"] layout_mode = 2 text = "Video" horizontal_alignment = 1 -[node name="Screen" type="OptionButton" parent="PanelContainer/MarginContainer/VBoxContainer/PanelContainer/VBoxContainer"] +[node name="Panel" type="Panel" parent="PanelContainer/MarginContainer/VBoxContainer/PanelContainer/MarginContainer/VBoxContainer/Label"] +show_behind_parent = true +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="Screen" type="OptionButton" parent="PanelContainer/MarginContainer/VBoxContainer/PanelContainer/MarginContainer/VBoxContainer"] layout_mode = 2 focus_mode = 0 item_count = 2 @@ -68,15 +84,31 @@ popup/item_1/id = 1 [node name="PanelContainer2" type="PanelContainer" parent="PanelContainer/MarginContainer/VBoxContainer"] layout_mode = 2 -[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer/PanelContainer2"] +[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/MarginContainer/VBoxContainer/PanelContainer2"] layout_mode = 2 +theme_override_constants/margin_left = 5 +theme_override_constants/margin_top = 5 +theme_override_constants/margin_right = 5 +theme_override_constants/margin_bottom = 5 -[node name="Label" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer/PanelContainer2/VBoxContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer/PanelContainer2/MarginContainer"] +layout_mode = 2 + +[node name="Label" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer/PanelContainer2/MarginContainer/VBoxContainer"] layout_mode = 2 text = "Mouse" horizontal_alignment = 1 -[node name="MouseMovementRestricted" type="CheckBox" parent="PanelContainer/MarginContainer/VBoxContainer/PanelContainer2/VBoxContainer"] +[node name="Panel" type="Panel" parent="PanelContainer/MarginContainer/VBoxContainer/PanelContainer2/MarginContainer/VBoxContainer/Label"] +show_behind_parent = true +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="MouseMovementRestricted" type="CheckBox" parent="PanelContainer/MarginContainer/VBoxContainer/PanelContainer2/MarginContainer/VBoxContainer"] layout_mode = 2 focus_mode = 0 text = "Mouse movement restricted to the game window" @@ -86,6 +118,6 @@ layout_mode = 2 theme = ExtResource("1_a5uwh") text = "BACK" -[connection signal="item_selected" from="PanelContainer/MarginContainer/VBoxContainer/PanelContainer/VBoxContainer/Screen" to="." method="_on_screen_item_selected"] -[connection signal="pressed" from="PanelContainer/MarginContainer/VBoxContainer/PanelContainer2/VBoxContainer/MouseMovementRestricted" to="." method="_on_mouse_movement_restricted_pressed"] +[connection signal="item_selected" from="PanelContainer/MarginContainer/VBoxContainer/PanelContainer/MarginContainer/VBoxContainer/Screen" to="." method="_on_screen_item_selected"] +[connection signal="pressed" from="PanelContainer/MarginContainer/VBoxContainer/PanelContainer2/MarginContainer/VBoxContainer/MouseMovementRestricted" to="." method="_on_mouse_movement_restricted_pressed"] [connection signal="pressed" from="PanelContainer/MarginContainer/VBoxContainer/Button" to="." method="_on_back_button_pressed"] diff --git a/source/main-menu/Play.tscn b/source/main-menu/Play.tscn index 530ff22..1f77bf1 100644 --- a/source/main-menu/Play.tscn +++ b/source/main-menu/Play.tscn @@ -24,10 +24,10 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -20.0 -offset_top = -20.0 -offset_right = 20.0 -offset_bottom = 20.0 +offset_left = -420.0 +offset_top = -429.0 +offset_right = 420.0 +offset_bottom = 429.0 grow_horizontal = 2 grow_vertical = 2 @@ -39,23 +39,23 @@ theme_override_constants/margin_right = 20 theme_override_constants/margin_bottom = 20 [node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer"] -custom_minimum_size = Vector2(600, 0) +custom_minimum_size = Vector2(800, 0) layout_mode = 2 theme_override_constants/separation = 10 alignment = 1 [node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer"] layout_mode = 2 +size_flags_vertical = 3 theme_override_constants/separation = 4 [node name="VBoxContainer2" type="VBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer/HBoxContainer"] layout_mode = 2 size_flags_horizontal = 3 -size_flags_stretch_ratio = 2.0 +size_flags_stretch_ratio = 3.0 theme_override_constants/separation = 5 [node name="Label" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer2"] -custom_minimum_size = Vector2(0, 30) layout_mode = 2 text = "Map" horizontal_alignment = 1 @@ -78,7 +78,7 @@ theme_override_constants/separation = 4 [node name="MapList" type="ItemList" parent="PanelContainer/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer2/HBoxContainer"] layout_mode = 2 size_flags_horizontal = 3 -size_flags_stretch_ratio = 2.0 +size_flags_stretch_ratio = 1.5 focus_mode = 0 item_count = 6 item_0/text = "Map 1" @@ -108,7 +108,6 @@ size_flags_horizontal = 3 theme_override_constants/separation = 5 [node name="Label" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer"] -custom_minimum_size = Vector2(0, 30) layout_mode = 2 text = "Players" horizontal_alignment = 1 diff --git a/source/resources/main_menu.theme b/source/resources/main_menu.theme index 8e055e82d40976fca8fd4561290faf5bfadba01c..32dce6746569a1d986ef0ed3a575ff525444a937 100644 GIT binary patch literal 898 zcmV-|1AY8bQ$s@n000005C8xV3IG6V0{{RhwJ-f(4+#Yu0LEc-L=ev;9l!tpfKuPm zmqkDTpa1|s5rCis)3i_I_91(dEpO6@-22`E5&1=U%TFV_*U!*K_;b)FX!C@Vmii`* zX%Ma~1ylfA0AB#4{~d2kT6q6+{HooRRN!ruq$N34d*og5bX1n?yIfOlTH$}t`Fb?u zOc`ER+sy~-bPR1)FWdhm|5ZN1g(t-cQH$!ofb+!`&Hs)68vg_Q&-eq`%YPGEE1nNt z$M=z3&+JtkOH|$`=X0{@<6Bj=guJI3pLIzRrm>)u`JZB$%Gb2QVDyQgRW=slKLgNY(u?UUV=itGT75A=wqX7z zc;tK8V)I?LQp+{fx*41{eJ@38cQ7(DG8HIHNRbc$1;PUd4HmG(tYEPLV%atmARhxf zL^(M+qpf8dwQM0GYzKx22S>%oM}$Dj_OoC+Fh(~TE+-kI8<&#|kAnbshp1ID%9o?^ zUDTy0Y6Zpf;+lp^GmnBtYeS8RL+7E;3`G-;4$m?Z2MZ{kb%433aXmsbBO{WOBq?-o z0ue)G+y)Zh13}6$5F|4J(MTW?q@*-u71A2-D2tH`pQp{_?|wzg#;%}miAy(Dd~9dx zd7bE?ivW)~#Jz9QcRy`}J;$Co+02r>Q!^1t;=IwDj0zKfz(fGSYEW>ORBwLIXpMjl zZDGK_DQ_hAkb8h|_rt%;t_~F7T*|GLG2CwJ%P})nFLak4ynqapn}3xpG;TejsAqm4 z5Q+uvr-z~&6d~tAm!HrEVWv_!x})3XtyMK^ol&#Tj@u&(YER56FxlCaHfyH(M1-4+ z1j>lDWe1RJIuN=GAFBPxP;ws-uwwvShP-g_8WTp6PGl7E6nP(kXB#Y(3EAEk4 zd3eqM9=%$Bn_;`_&pE_|BnV)qvz+fefo)YnZ&jg2h)j}0wG>^*wv8TmEK|$BkUMP$ zzU%vS`9f`=dpp$)&-aCX4Trzde(g*IcBsCj3{H>3nMHGip^uQQ2utFgXH8i$jgT8& YR?KnhN8NS&`Lb0CsEuCW4pLJ?L$=$RYybcN literal 738 zcmV<80v-KQQ$s@n000005C8zz2LJ%d0ssIgwJ-f(*9HX^0EQi8Kp>Bk4iYo~!+9ps z6a_#CK$t4QfY@q3k=utzN!wjwiKKn&b!+TrlBNBhReiCq<&U!Xre<`oTTiG*8KUcJmuEAcXv#NLmoFk^3H9t5SY8^(>2wf}H zaR33x%pm1tle*HtsnrPL;A}jsrr@Yar6g-UQqh#!tFMimr2Y@Ms)17?f}R z&pZ??v{GZ&1`>NzrilcTy3qCVC+fNn%djz&{|rd%5k0j&{}r6lIaOlOU6NPo3R^RK zvD9-;%iWphe}d&oqkFUIbfDHTbCpt|h10=M8eMGHdA zDrABxlAxrhq-7O~)v*{BBwXq&BvIosYtlnBC}#3`#ZYV^*u+T_+lpP_IA_?E{Imv0 zqDEg=r}O+6O2>kc0x`45g`6oUS(Jlnxc70qGa1vsQ&?^Gm>5Af0d5j7- z_DzmR1rcu^vSpz~0ZpROyQ$JyA}doF8kZqbsEd`|&uzUL~2TWl2W?CrE-VS UY~6MI`GHgjy_W>#4pLJ?Ly2r$M*si-