fix: make sure course thumbnails are clickable on end screens, simpli…

…fy ui core
GDQuest · Dec 10, 2023 · c81e9de · c81e9de
1 parent 2fc11f7
commit c81e9de
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 17 deletions.
diff --git a/ui/UICore.gd b/ui/UICore.gd
@@ -14,8 +14,6 @@ var _course_navigator: UINavigator
 onready var _pages := $Pages as Control
 onready var _loading_screen := $Pages/LoadingScreen as LoadingScreen
 onready var _welcome_screen := $Pages/WelcomeScreen as WelcomeScreen
-onready var _end_screen := $Pages/EndScreen as Control
-onready var _sponsorless_end_screen := $Pages/SponsorlessEndScreen as Control
 onready var _settings_screen := $Pages/SettingsScreen as Control
 onready var _course_screen := $Pages/CourseScreen as Control
 
@@ -138,9 +136,9 @@ func _show_end_screen(_course: Course) -> void:
 		page.hide()
 
 	if show_sponsored_screen:
-		_end_screen.show()
+		get_tree().change_scene("res://ui/screens/end_screen/EndScreen.tscn")
 	else:
-		_sponsorless_end_screen.show()
+		get_tree().change_scene("res://ui/screens/end_screen/SponsorlessEndScreen.tscn")
 
 
 func _go_to_welcome_screen() -> void:

diff --git a/ui/UICore.tscn b/ui/UICore.tscn
@@ -1,20 +1,20 @@
-[gd_scene load_steps=11 format=2]
+[gd_scene load_steps=9 format=2]
 
 [ext_resource path="res://ui/screens/welcome_screen/WelcomeScreen.tscn" type="PackedScene" id=1]
 [ext_resource path="res://ui/theme/gdscript_app_theme.tres" type="Theme" id=2]
 [ext_resource path="res://ui/LoadingScreen.tscn" type="PackedScene" id=3]
 [ext_resource path="res://ui/UICore.gd" type="Script" id=4]
 [ext_resource path="res://ui/components/popups/ReportFormPopup.tscn" type="PackedScene" id=5]
 [ext_resource path="res://ui/components/popups/SettingsPopup.tscn" type="PackedScene" id=6]
-[ext_resource path="res://ui/screens/end_screen/EndScreen.tscn" type="PackedScene" id=7]
 [ext_resource path="res://ui/UIVersion.gd" type="Script" id=8]
 [ext_resource path="res://ui/theme/fonts/font_version.tres" type="DynamicFont" id=9]
-[ext_resource path="res://ui/screens/end_screen/SponsorlessEndScreen.tscn" type="PackedScene" id=10]
 
 [node name="UICore" type="Control"]
 pause_mode = 2
 anchor_right = 1.0
 anchor_bottom = 1.0
+margin_left = 2.0
+margin_right = 2.0
 mouse_filter = 2
 theme = ExtResource( 2 )
 script = ExtResource( 4 )
@@ -39,13 +39,6 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 mouse_filter = 2
 
-[node name="EndScreen" parent="Pages" instance=ExtResource( 7 )]
-visible = false
-mouse_filter = 2
-
-[node name="SponsorlessEndScreen" parent="Pages" instance=ExtResource( 10 )]
-visible = false
-
 [node name="LoadingScreen" parent="Pages" instance=ExtResource( 3 )]
 mouse_filter = 2
 
@@ -72,6 +65,7 @@ margin_right = -2.0
 grow_vertical = 0
 rect_min_size = Vector2( 1918, 20 )
 focus_mode = 2
+mouse_filter = 2
 custom_colors/default_color = Color( 0.572549, 0.560784, 0.721569, 1 )
 custom_fonts/normal_font = ExtResource( 9 )
 bbcode_enabled = true

diff --git a/ui/screens/end_screen/EndScreen.tscn b/ui/screens/end_screen/EndScreen.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=49 format=2]
+[gd_scene load_steps=50 format=2]
 
 [ext_resource path="res://ui/theme/fonts/Inter-Medium.ttf" type="DynamicFontData" id=1]
 [ext_resource path="res://ui/theme/gdscript_app_theme.tres" type="Theme" id=2]
@@ -23,6 +23,13 @@
 [ext_resource path="res://ui/screens/end_screen/third-person-platformer-panoramic.jpg" type="Texture" id=21]
 [ext_resource path="res://ui/screens/end_screen/arrow_black.svg" type="Texture" id=22]
 
+[sub_resource type="GDScript" id=37]
+script/source = "extends Button
+
+func _ready() -> void:
+	connect(\"pressed\", get_tree(), \"change_scene\", [\"res://ui/UICore.tscn\"])
+"
+
 [sub_resource type="StyleBoxFlat" id=1]
 bg_color = Color( 0.251478, 0.2021, 0.43, 0.894118 )
 shadow_offset = Vector2( 0, 4 )
@@ -241,6 +248,7 @@ hint_tooltip = "Open the course index"
 mouse_default_cursor_shape = 2
 icon = ExtResource( 11 )
 flat = true
+script = SubResource( 37 )
 
 [node name="Control" type="Control" parent="Layout/TopBar/MarginContainer/ToolBarLayout"]
 margin_left = 48.0

diff --git a/ui/screens/end_screen/SponsorlessEndScreen.tscn b/ui/screens/end_screen/SponsorlessEndScreen.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=20 format=2]
+[gd_scene load_steps=21 format=2]
 
 [ext_resource path="res://ui/theme/fonts/font_title.tres" type="DynamicFont" id=1]
 [ext_resource path="res://ui/theme/gdscript_app_theme.tres" type="Theme" id=2]
@@ -13,6 +13,13 @@
 [ext_resource path="res://ui/screens/end_screen/main_menu/sky_dark.png" type="Texture" id=12]
 [ext_resource path="res://ui/screens/end_screen/main_menu/sky_day_blurred.png" type="Texture" id=13]
 
+[sub_resource type="GDScript" id=10]
+script/source = "extends Button
+
+func _ready() -> void:
+	connect(\"pressed\", get_tree(), \"change_scene\", [\"res://ui/UICore.tscn\"])
+"
+
 [sub_resource type="GDScript" id=2]
 script/source = "tool
 extends HBoxContainer
@@ -117,6 +124,7 @@ hint_tooltip = "Open the course index"
 mouse_default_cursor_shape = 2
 icon = ExtResource( 11 )
 flat = true
+script = SubResource( 10 )
 
 [node name="Control" type="Control" parent="Layout/TopBar/MarginContainer/ToolBarLayout"]
 margin_left = 48.0
@@ -223,7 +231,7 @@ bbcode_enabled = true
 bbcode_text = "Like Godot, this app and course is free and open-source. 
 
 You can find the app's source code and contribute translations here: [url=\"https://github.com/GDQuest/learn-gdscript\"]Learn GDScript From Zero (Github repository)[/url]."
-text = "Like Godot, this app and course are free and open-source. 
+text = "Like Godot, this app and course is free and open-source. 
 
 You can find the app's source code and contribute translations here: Learn GDScript From Zero (Github repository)."
 fit_content_height = true