From 2c2ee99cf2d304ec28eed8560860267e95ee9017 Mon Sep 17 00:00:00 2001 From: Spartan322 Date: Fri, 21 Apr 2023 20:53:42 -0400 Subject: Refurbish UI elements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move GameSession MusicPlayer to below OptionsMenu Ensures the MusicPlayer appears above the OptionsMenu Add Save and Quit/Resign to GameSessionMenu resign/quit popup To allow the player to save and resign/quit more quicker Remove GameSessionMenu hide on OptionsMenu open Renamed many UI elements to better reflect their purpose Add SessionButton theme_type_variation to GameSession buttons Add SessionButton style similar to TitleButton Disable 3D for dialog windows Change _play_pause_display_button pause text to "⏸ " Change IncreaseSpeedButton text to + Change DecreaseSpeedButton text to - Change Minimap NinePatch frame to function like a nine patch Rename actions map_zoomin and map_zoomout to map_zoom_in and map_zoom_out Change ProvinceOverviewPanel to a PanelContainer Reorganize ProvinceOverviewPanel to better use container functionality Optimize MusicPlayer Enables one line support for MusicPlayer Add warning to StyleBoxWithSound to avoid UI elements with toggle functionality --- game/theme/game_session_menu.tres | 84 +++++++++++++++++++++++++++++++++++++++ game/theme/main_menu.tres | 6 +-- 2 files changed, 87 insertions(+), 3 deletions(-) create mode 100644 game/theme/game_session_menu.tres (limited to 'game/theme') diff --git a/game/theme/game_session_menu.tres b/game/theme/game_session_menu.tres new file mode 100644 index 0000000..42775c3 --- /dev/null +++ b/game/theme/game_session_menu.tres @@ -0,0 +1,84 @@ +[gd_resource type="Theme" load_steps=11 format=3 uid="uid://dndova5cw036e"] + +[ext_resource type="StyleBox" uid="uid://blwilunhmyvpq" path="res://theme/assets/main_menu_button_normal.tres" id="1_7med2"] +[ext_resource type="Script" path="res://src/Utility/StyleBoxWithSound.gd" id="2_oj3dv"] +[ext_resource type="AudioStream" uid="uid://bsldcs3l8s7ug" path="res://addons/kenney_ui_audio/click3.wav" id="3_j823n"] +[ext_resource type="Texture2D" uid="uid://c0p34i3d3b0pw" path="res://theme/assets/main_menu_button.png" id="4_lno5s"] + +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_jvvyi"] +content_margin_left = 20.0 +content_margin_top = 10.0 +content_margin_right = 20.0 +content_margin_bottom = 14.0 +texture = ExtResource("4_lno5s") +modulate_color = Color(0.817521, 0.817521, 0.817521, 0.784314) + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_6ab1x"] +draw_center = false +border_width_left = 10 +border_width_top = 15 +border_width_right = 10 +border_width_bottom = 15 +border_color = Color(0, 0, 0, 0.584314) +border_blend = true +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 +corner_detail = 20 + +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_jslj0"] +content_margin_left = 20.0 +content_margin_top = 10.0 +content_margin_right = 20.0 +content_margin_bottom = 14.0 +texture = ExtResource("4_lno5s") +modulate_color = Color(0.588235, 0.588235, 0.588235, 1) + +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_l2rw3"] +content_margin_left = 20.0 +content_margin_top = 10.0 +content_margin_right = 20.0 +content_margin_bottom = 14.0 +texture = ExtResource("4_lno5s") +modulate_color = Color(0.85098, 0.85098, 0.85098, 1) + +[sub_resource type="StyleBox" id="StyleBox_ptkcj"] +resource_local_to_scene = false +resource_name = "" +content_margin_left = -1.0 +content_margin_top = -1.0 +content_margin_right = -1.0 +content_margin_bottom = -1.0 +script = ExtResource("2_oj3dv") +style_box = SubResource("StyleBoxTexture_l2rw3") +sound = ExtResource("3_j823n") + +[sub_resource type="StyleBoxLine" id="StyleBoxLine_kaw4i"] +color = Color(0.454902, 0.45098, 0.435294, 1) +thickness = 2 + +[resource] +SessionButton/base_type = &"Button" +SessionButton/colors/font_color = Color(0.87451, 0.87451, 0.87451, 1) +SessionButton/colors/font_disabled_color = Color(0.87451, 0.87451, 0.87451, 0.501961) +SessionButton/colors/font_focus_color = Color(0.94902, 0.94902, 0.94902, 1) +SessionButton/colors/font_hover_color = Color(0.94902, 0.94902, 0.94902, 1) +SessionButton/colors/font_hover_pressed_color = Color(1, 1, 1, 1) +SessionButton/colors/font_outline_color = Color(1, 1, 1, 1) +SessionButton/colors/font_pressed_color = Color(1, 1, 1, 1) +SessionButton/colors/icon_disabled_color = Color(1, 1, 1, 0.4) +SessionButton/colors/icon_focus_color = Color(0.94902, 0.94902, 0.94902, 1) +SessionButton/colors/icon_hover_color = Color(0.94902, 0.94902, 0.94902, 1) +SessionButton/colors/icon_hover_pressed_color = Color(1, 1, 1, 1) +SessionButton/colors/icon_normal_color = Color(1, 1, 1, 1) +SessionButton/colors/icon_pressed_color = Color(1, 1, 1, 1) +SessionButton/styles/disabled = SubResource("StyleBoxTexture_jvvyi") +SessionButton/styles/focus = SubResource("StyleBoxFlat_6ab1x") +SessionButton/styles/hover = SubResource("StyleBoxTexture_jslj0") +SessionButton/styles/normal = ExtResource("1_7med2") +SessionButton/styles/pressed = SubResource("StyleBox_ptkcj") +SessionPanel/base_type = &"Panel" +SessionPanel/styles/panel = null +SessionSeparator/base_type = &"HSeparator" +SessionSeparator/styles/separator = SubResource("StyleBoxLine_kaw4i") diff --git a/game/theme/main_menu.tres b/game/theme/main_menu.tres index 6a3f73d..0518cd8 100644 --- a/game/theme/main_menu.tres +++ b/game/theme/main_menu.tres @@ -171,9 +171,9 @@ CommitLabel/styles/normal = SubResource("StyleBoxEmpty_kmfi1") CommitLabel/styles/pressed = SubResource("StyleBoxEmpty_1qcrh") TitleButton/base_type = &"Button" TitleButton/colors/font_color = Color(0.87451, 0.87451, 0.87451, 1) -TitleButton/colors/font_disabled_color = Color(0.875, 0.875, 0.875, 0.5) -TitleButton/colors/font_focus_color = Color(0.95, 0.95, 0.95, 1) -TitleButton/colors/font_hover_color = Color(0.95, 0.95, 0.95, 1) +TitleButton/colors/font_disabled_color = Color(0.87451, 0.87451, 0.87451, 0.501961) +TitleButton/colors/font_focus_color = Color(0.94902, 0.94902, 0.94902, 1) +TitleButton/colors/font_hover_color = Color(0.94902, 0.94902, 0.94902, 1) TitleButton/colors/font_hover_pressed_color = Color(1, 1, 1, 1) TitleButton/colors/font_outline_color = Color(1, 1, 1, 1) TitleButton/colors/font_pressed_color = Color(1, 1, 1, 1) -- cgit v1.2.3-56-ga3b1