diff --git a/assets/ui/sci-fi-godot-theme/sci-fi-theme.tres b/assets/ui/sci-fi-godot-theme/sci-fi-theme.tres index ea1ce4e..f27756e 100644 --- a/assets/ui/sci-fi-godot-theme/sci-fi-theme.tres +++ b/assets/ui/sci-fi-godot-theme/sci-fi-theme.tres @@ -75,7 +75,14 @@ region = Rect2( 100, 20, 7, 8 ) [sub_resource type="StyleBoxEmpty" id=10] -[sub_resource type="StyleBoxEmpty" id=11] +[sub_resource type="StyleBoxFlat" id=96] +bg_color = Color( 0.423529, 0.898039, 0.756863, 0.4 ) +border_width_left = 31 +border_width_top = 1 +border_width_right = 22 +border_width_bottom = 1 +border_color = Color( 0.0901961, 0.14902, 0.270588, 0.345098 ) +border_blend = true [sub_resource type="StyleBoxEmpty" id=12] @@ -329,9 +336,7 @@ margin_right = 2.0 margin_top = 2.0 margin_bottom = 2.0 -[sub_resource type="StyleBoxEmpty" id=52] - -[sub_resource type="StyleBoxTexture" id=53] +[sub_resource type="StyleBoxTexture" id=97] texture = ExtResource( 2 ) region_rect = Rect2( 17, 97, 14, 14 ) margin_left = 2.0 @@ -347,6 +352,14 @@ margin_right = 2.0 margin_top = 2.0 margin_bottom = 2.0 +[sub_resource type="StyleBoxTexture" id=53] +texture = ExtResource( 2 ) +region_rect = Rect2( 17, 97, 14, 14 ) +margin_left = 2.0 +margin_right = 2.0 +margin_top = 2.0 +margin_bottom = 2.0 + [sub_resource type="StyleBoxTexture" id=55] content_margin_left = 15.0 content_margin_right = 16.0 @@ -655,7 +668,7 @@ CheckBox/icons/radio_checked = SubResource( 7 ) CheckBox/icons/radio_unchecked = SubResource( 8 ) CheckBox/icons/unchecked = SubResource( 9 ) CheckBox/styles/disabled = SubResource( 10 ) -CheckBox/styles/focus = SubResource( 11 ) +CheckBox/styles/focus = SubResource( 96 ) CheckBox/styles/hover = SubResource( 12 ) CheckBox/styles/hover_pressed = SubResource( 13 ) CheckBox/styles/normal = SubResource( 14 ) @@ -741,8 +754,9 @@ MenuButton/styles/focus = SubResource( 46 ) MenuButton/styles/hover = SubResource( 47 ) MenuButton/styles/normal = SubResource( 48 ) MenuButton/styles/pressed = SubResource( 49 ) -OptionButton/colors/font_color = Color( 0.88, 0.88, 0.88, 1 ) +OptionButton/colors/font_color = Color( 1, 1, 1, 1 ) OptionButton/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) +OptionButton/colors/font_color_focus = Color( 0.376471, 0.909804, 0.768627, 1 ) OptionButton/colors/font_color_hover = Color( 0.376471, 0.909804, 0.768627, 1 ) OptionButton/colors/font_color_pressed = Color( 1, 1, 1, 1 ) OptionButton/constants/arrow_margin = 2 @@ -750,8 +764,8 @@ OptionButton/constants/hseparation = 2 OptionButton/fonts/font = ExtResource( 3 ) OptionButton/icons/arrow = SubResource( 50 ) OptionButton/styles/disabled = SubResource( 51 ) -OptionButton/styles/focus = SubResource( 52 ) -OptionButton/styles/hover = SubResource( 53 ) +OptionButton/styles/focus = SubResource( 97 ) +OptionButton/styles/hover = SubResource( 97 ) OptionButton/styles/normal = SubResource( 54 ) OptionButton/styles/pressed = SubResource( 53 ) Panel/styles/panel = SubResource( 55 ) diff --git a/src/UserInterface/Screens/MainMenu/LevelCheckBox.gd b/src/UserInterface/Screens/MainMenu/LevelCheckBox.gd index df9b540..82f73c4 100644 --- a/src/UserInterface/Screens/MainMenu/LevelCheckBox.gd +++ b/src/UserInterface/Screens/MainMenu/LevelCheckBox.gd @@ -11,8 +11,8 @@ func initialize_with_progress(levelFullName: String) -> void: var level_time : float = GlobalState.get_level_time(levelFullName) if(GlobalState.get_level_completed(levelFullName)): - $LevelTime.visible = true - $LevelTime.text = "Time " + str(round(level_time*1000)/1000) + " sec" + $"%LevelTime".visible = true + $"%LevelTime".text = "Time " + str(round(level_time*1000)/1000) + " sec" func register_froggy(var count : int = 0, var freed: bool = false) -> void: diff --git a/src/UserInterface/Screens/MainMenu/LevelCheckBox.tscn b/src/UserInterface/Screens/MainMenu/LevelCheckBox.tscn index 8d8cf55..67a473b 100644 --- a/src/UserInterface/Screens/MainMenu/LevelCheckBox.tscn +++ b/src/UserInterface/Screens/MainMenu/LevelCheckBox.tscn @@ -45,9 +45,9 @@ script = ExtResource( 4 ) [node name="FreedFroggy1" type="TextureRect" parent="."] unique_name_in_owner = true visible = false -margin_top = 28.0 -margin_right = 119.0 -margin_bottom = 47.0 +margin_top = 21.0 +margin_right = 126.0 +margin_bottom = 40.0 grow_horizontal = 2 grow_vertical = 2 focus_mode = 2 @@ -163,10 +163,12 @@ size_flags_vertical = 3 texture = ExtResource( 2 ) [node name="LevelTime" type="Label" parent="."] +unique_name_in_owner = true visible = false margin_top = 21.0 margin_right = 126.0 margin_bottom = 32.0 +focus_mode = 2 custom_colors/font_color = Color( 0.717647, 0.717647, 0.717647, 1 ) custom_fonts/font = SubResource( 13 ) text = "Time: 10 sec"