From 2a4a578f19ec226129880acf9a1f5107fe1baa5c Mon Sep 17 00:00:00 2001 From: Dan Date: Sat, 11 May 2024 15:13:55 +0100 Subject: [PATCH] Update theme with new content margins and shadow color. Adjust font shadow color for level labels. Set tooltip text for "HappyBees" label in LevelCompleteComponent. --- resources/theme/game_theme.tres | 30 +++++++++++++++++++++++------- scenes/high_scores.tscn | 12 ++++++++++++ ui/LevelCompleteComponent.tscn | 2 ++ 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/resources/theme/game_theme.tres b/resources/theme/game_theme.tres index 42709df..2b3edb6 100644 --- a/resources/theme/game_theme.tres +++ b/resources/theme/game_theme.tres @@ -1,8 +1,12 @@ -[gd_resource type="Theme" load_steps=9 format=3 uid="uid://cpkvret5gi66h"] +[gd_resource type="Theme" load_steps=10 format=3 uid="uid://cpkvret5gi66h"] [ext_resource type="FontFile" uid="uid://beyoaacc7uhy1" path="res://resources/fonts/Kaph-Regular.ttf" id="1_fwiur"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_lcmkq"] +content_margin_left = 20.0 +content_margin_top = 20.0 +content_margin_right = 20.0 +content_margin_bottom = 20.0 bg_color = Color(0.996078, 0.85098, 0.498039, 0.776471) border_width_left = 4 border_width_top = 4 @@ -57,7 +61,7 @@ corner_radius_top_left = 5 corner_radius_top_right = 5 corner_radius_bottom_right = 5 corner_radius_bottom_left = 5 -shadow_color = Color(0, 0, 0, 0.258824) +shadow_color = Color(0, 0, 0, 0) [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_crayb"] bg_color = Color(0.819608, 0.454902, 0.254902, 1) @@ -71,10 +75,6 @@ border_width_top = 4 border_width_right = 4 border_width_bottom = 4 border_color = Color(0.819608, 0.454902, 0.254902, 1) -corner_radius_top_left = 5 -corner_radius_top_right = 5 -corner_radius_bottom_right = 5 -corner_radius_bottom_left = 5 shadow_color = Color(0, 0, 0, 0.258824) [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_vj6bi"] @@ -89,12 +89,24 @@ corner_radius_bottom_right = 6 corner_radius_bottom_left = 6 corner_detail = 6 +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_4h8x0"] +content_margin_left = 20.0 +content_margin_top = 20.0 +content_margin_right = 20.0 +content_margin_bottom = 20.0 +bg_color = Color(0.996078, 0.85098, 0.498039, 1) +border_width_left = 2 +border_width_top = 2 +border_width_right = 2 +border_width_bottom = 2 +border_color = Color(0.819608, 0.454902, 0.254902, 1) + [resource] default_font = ExtResource("1_fwiur") default_font_size = 12 Button/colors/font_color = Color(0.819608, 0.454902, 0.254902, 1) Button/colors/font_hover_color = Color(0.819608, 0.454902, 0.254902, 1) -Button/colors/font_pressed_color = Color(1, 0.878431, 0.545098, 1) +Button/colors/font_pressed_color = Color(1, 0.960784, 0.854902, 1) Button/constants/h_separation = 5 Button/font_sizes/font_size = 16 Button/styles/hover = SubResource("StyleBoxFlat_lcmkq") @@ -111,3 +123,7 @@ PopupMenu/constants/v_separation = 6 PopupMenu/styles/hover = SubResource("StyleBoxFlat_crayb") PopupMenu/styles/panel = SubResource("StyleBoxFlat_0rei0") ProgressBar/styles/fill = SubResource("StyleBoxFlat_vj6bi") +TooltipLabel/colors/font_color = Color(0.819608, 0.454902, 0.254902, 1) +TooltipLabel/colors/font_shadow_color = Color(0, 0, 0, 0) +TooltipLabel/font_sizes/font_size = 18 +TooltipPanel/styles/panel = SubResource("StyleBoxFlat_4h8x0") diff --git a/scenes/high_scores.tscn b/scenes/high_scores.tscn index 7d21e8c..259d35c 100644 --- a/scenes/high_scores.tscn +++ b/scenes/high_scores.tscn @@ -255,12 +255,14 @@ layout_mode = 2 [node name="LevelOneLabel" type="Label" parent="HighScores/CenterContainer/MarginContainer/GridContainer/LevelScoreContainer1/MarginContainer/VBoxContainer"] layout_mode = 2 +theme_override_colors/font_shadow_color = Color(0, 0, 0, 0) text = "Level One" horizontal_alignment = 1 [node name="LevelOneScoreLabel" type="Label" parent="HighScores/CenterContainer/MarginContainer/GridContainer/LevelScoreContainer1/MarginContainer/VBoxContainer"] unique_name_in_owner = true layout_mode = 2 +theme_override_colors/font_shadow_color = Color(0, 0, 0, 0) theme_override_font_sizes/font_size = 20 text = "123121" horizontal_alignment = 1 @@ -286,12 +288,14 @@ layout_mode = 2 [node name="LevelTwoLabel" type="Label" parent="HighScores/CenterContainer/MarginContainer/GridContainer/LevelScoreContainer2/MarginContainer/VBoxContainer"] layout_mode = 2 +theme_override_colors/font_shadow_color = Color(0, 0, 0, 0) text = "Level Two" horizontal_alignment = 1 [node name="LevelTwoScoreLabel" type="Label" parent="HighScores/CenterContainer/MarginContainer/GridContainer/LevelScoreContainer2/MarginContainer/VBoxContainer"] unique_name_in_owner = true layout_mode = 2 +theme_override_colors/font_shadow_color = Color(0, 0, 0, 0) theme_override_font_sizes/font_size = 20 text = "123121" horizontal_alignment = 1 @@ -317,12 +321,14 @@ layout_mode = 2 [node name="LevelThreeLabel" type="Label" parent="HighScores/CenterContainer/MarginContainer/GridContainer/LevelScoreContainer3/MarginContainer/VBoxContainer"] layout_mode = 2 +theme_override_colors/font_shadow_color = Color(0, 0, 0, 0) text = "Level Three" horizontal_alignment = 1 [node name="LevelThreeScoreLabel" type="Label" parent="HighScores/CenterContainer/MarginContainer/GridContainer/LevelScoreContainer3/MarginContainer/VBoxContainer"] unique_name_in_owner = true layout_mode = 2 +theme_override_colors/font_shadow_color = Color(0, 0, 0, 0) theme_override_font_sizes/font_size = 20 text = "123121" horizontal_alignment = 1 @@ -348,12 +354,14 @@ layout_mode = 2 [node name="LevelFourLabel" type="Label" parent="HighScores/CenterContainer/MarginContainer/GridContainer/LevelScoreContainer4/MarginContainer/VBoxContainer"] layout_mode = 2 +theme_override_colors/font_shadow_color = Color(0, 0, 0, 0) text = "Level Four" horizontal_alignment = 1 [node name="LevelFourScoreLabel" type="Label" parent="HighScores/CenterContainer/MarginContainer/GridContainer/LevelScoreContainer4/MarginContainer/VBoxContainer"] unique_name_in_owner = true layout_mode = 2 +theme_override_colors/font_shadow_color = Color(0, 0, 0, 0) theme_override_font_sizes/font_size = 20 text = "123121" horizontal_alignment = 1 @@ -379,12 +387,14 @@ layout_mode = 2 [node name="LevelFiveLabel" type="Label" parent="HighScores/CenterContainer/MarginContainer/GridContainer/LevelScoreContainer5/MarginContainer/VBoxContainer"] layout_mode = 2 +theme_override_colors/font_shadow_color = Color(0, 0, 0, 0) text = "Level Five" horizontal_alignment = 1 [node name="LevelFiveScoreLabel" type="Label" parent="HighScores/CenterContainer/MarginContainer/GridContainer/LevelScoreContainer5/MarginContainer/VBoxContainer"] unique_name_in_owner = true layout_mode = 2 +theme_override_colors/font_shadow_color = Color(0, 0, 0, 0) theme_override_font_sizes/font_size = 20 text = "123121" horizontal_alignment = 1 @@ -410,12 +420,14 @@ layout_mode = 2 [node name="LevelSixLabel" type="Label" parent="HighScores/CenterContainer/MarginContainer/GridContainer/LevelScoreContainer6/MarginContainer/VBoxContainer"] layout_mode = 2 +theme_override_colors/font_shadow_color = Color(0, 0, 0, 0) text = "Level Six" horizontal_alignment = 1 [node name="LevelSixScoreLabel" type="Label" parent="HighScores/CenterContainer/MarginContainer/GridContainer/LevelScoreContainer6/MarginContainer/VBoxContainer"] unique_name_in_owner = true layout_mode = 2 +theme_override_colors/font_shadow_color = Color(0, 0, 0, 0) theme_override_font_sizes/font_size = 20 text = "123121" horizontal_alignment = 1 diff --git a/ui/LevelCompleteComponent.tscn b/ui/LevelCompleteComponent.tscn index c6181fc..80d6046 100644 --- a/ui/LevelCompleteComponent.tscn +++ b/ui/LevelCompleteComponent.tscn @@ -39,6 +39,8 @@ layout_mode = 2 [node name="HappyBees" type="Label" parent="MarginContainer/CenterContainer/VBoxContainer"] layout_mode = 2 +tooltip_text = "Valheim is a great game." +mouse_filter = 0 theme_override_colors/font_color = Color(0.819608, 0.454902, 0.254902, 1) theme_override_font_sizes/font_size = 30 text = "The Bees Are Happy!"