From ad0c781deef5d75e38721b295495ddd488a5b1d5 Mon Sep 17 00:00:00 2001 From: Ryan Reed Date: Sun, 30 Mar 2025 09:05:32 -0400 Subject: [PATCH] Moving to a common theme for all menus --- resources/pause_menu_theme.tres | 2 ++ scenes/ui/pause_menu/main_menu.tscn | 6 ++++-- scenes/ui/pause_menu/saves_menu.tscn | 4 +++- scenes/ui/pause_menu/settings_menu.tscn | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/resources/pause_menu_theme.tres b/resources/pause_menu_theme.tres index af3d5d8..af1ee3e 100644 --- a/resources/pause_menu_theme.tres +++ b/resources/pause_menu_theme.tres @@ -4,3 +4,5 @@ Button/colors/font_color = Color(0.839216, 0.933333, 1, 1) Button/constants/outline_size = 2 Button/font_sizes/font_size = 20 +MenuTitle/base_type = &"Label" +MenuTitle/font_sizes/font_size = 40 diff --git a/scenes/ui/pause_menu/main_menu.tscn b/scenes/ui/pause_menu/main_menu.tscn index e87a053..f272907 100644 --- a/scenes/ui/pause_menu/main_menu.tscn +++ b/scenes/ui/pause_menu/main_menu.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=6 format=3 uid="uid://c36xeip0cq3ov"] +[gd_scene load_steps=7 format=3 uid="uid://c36xeip0cq3ov"] [ext_resource type="Script" uid="uid://bwvwpiwhp52e" path="res://scenes/ui/pause_menu/main_menu.gd" id="1_qhoi0"] +[ext_resource type="Theme" uid="uid://b5q8b0l6qp1dt" path="res://resources/pause_menu_theme.tres" id="1_t42ad"] [sub_resource type="Animation" id="Animation_ightw"] length = 0.001 @@ -101,6 +102,7 @@ anchors_preset = 9 anchor_bottom = 1.0 offset_left = -400.0 grow_vertical = 2 +theme = ExtResource("1_t42ad") color = Color(0.133333, 0.133333, 0.133333, 0.784314) script = ExtResource("1_qhoi0") animation_player = NodePath("AnimationPlayer") @@ -130,7 +132,7 @@ theme_override_constants/separation = 20 [node name="Title" type="Label" parent="MainContent/MenuContainer"] layout_mode = 2 -theme_override_font_sizes/font_size = 40 +theme_type_variation = &"MenuTitle" text = "Paused" horizontal_alignment = 1 vertical_alignment = 1 diff --git a/scenes/ui/pause_menu/saves_menu.tscn b/scenes/ui/pause_menu/saves_menu.tscn index c09c31f..b61b5ff 100644 --- a/scenes/ui/pause_menu/saves_menu.tscn +++ b/scenes/ui/pause_menu/saves_menu.tscn @@ -1,5 +1,6 @@ -[gd_scene load_steps=11 format=3 uid="uid://dy3dbe2l3kqdn"] +[gd_scene load_steps=12 format=3 uid="uid://dy3dbe2l3kqdn"] +[ext_resource type="Theme" uid="uid://b5q8b0l6qp1dt" path="res://resources/pause_menu_theme.tres" id="1_4p2cp"] [ext_resource type="Script" uid="uid://di8dm3fdxfwo1" path="res://scenes/ui/pause_menu/saves_menu.gd" id="1_x1uhs"] [ext_resource type="PackedScene" uid="uid://cyxieflejsggu" path="res://scenes/ui/pause_menu/saves_manager/save_files_list.tscn" id="2_4p2cp"] [ext_resource type="PackedScene" uid="uid://bb7poutsn4ex2" path="res://scenes/ui/pause_menu/saves_manager/save_file.tscn" id="3_r04ci"] @@ -106,6 +107,7 @@ anchors_preset = 9 anchor_bottom = 1.0 offset_right = 450.0 grow_vertical = 2 +theme = ExtResource("1_4p2cp") color = Color(0.133333, 0.133333, 0.133333, 0.784314) script = ExtResource("1_x1uhs") show_save_ui_button = NodePath("MarginContainer/VBoxContainer/BottomRow/SaveButton") diff --git a/scenes/ui/pause_menu/settings_menu.tscn b/scenes/ui/pause_menu/settings_menu.tscn index 8a71ea2..c32951f 100644 --- a/scenes/ui/pause_menu/settings_menu.tscn +++ b/scenes/ui/pause_menu/settings_menu.tscn @@ -113,6 +113,7 @@ anchors_preset = 9 anchor_bottom = 1.0 offset_right = 400.0 grow_vertical = 2 +theme = ExtResource("2_oec81") color = Color(0.133333, 0.133333, 0.133333, 0.784314) script = ExtResource("1_govsn") autosaves_input = NodePath("MainContent/VBoxContainer/TabContainer/Game/Autosaves/CheckButton") @@ -155,7 +156,7 @@ theme_override_constants/separation = 20 [node name="Title" type="Label" parent="MainContent/VBoxContainer"] layout_mode = 2 -theme_override_font_sizes/font_size = 40 +theme_type_variation = &"MenuTitle" text = "Settings" horizontal_alignment = 1 @@ -359,7 +360,6 @@ theme_override_constants/margin_bottom = 10 [node name="CloseButton" type="Button" parent="BottomRow"] custom_minimum_size = Vector2(141, 36) layout_mode = 2 -theme = ExtResource("2_oec81") text = "Close Settings" [connection signal="toggled" from="MainContent/VBoxContainer/TabContainer/Game/BlockHighlight/CheckButton" to="." method="_on_block_highlighting_toggled"]