From 8a8764991af5d58793773518b9b474991f6709c8 Mon Sep 17 00:00:00 2001
From: nashmuhandes <nashbackslash@gmail.com>
Date: Sat, 21 Jun 2025 17:05:34 +0800
Subject: [PATCH] Move the version label on the launcher out of the banner
 area, to avoid visual clashing (the label might be unreadable, depending on
 the colors used on the banner graphic, if it ever gets updated)

---
 src/launcher/launcherbanner.cpp | 11 -----------
 src/launcher/launcherbanner.h   |  2 --
 src/launcher/launcherwindow.cpp |  1 -
 src/launcher/playgamepage.cpp   |  7 +++++++
 src/launcher/playgamepage.h     |  1 +
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/launcher/launcherbanner.cpp b/src/launcher/launcherbanner.cpp
index 823b0021d..8e834c5d9 100644
--- a/src/launcher/launcherbanner.cpp
+++ b/src/launcher/launcherbanner.cpp
@@ -9,19 +9,9 @@
 LauncherBanner::LauncherBanner(Widget* parent) : Widget(parent)
 {
 	Logo = new ImageBox(this);
-	VersionLabel = new TextLabel(this);
-	VersionLabel->SetTextAlignment(TextLabelAlignment::Right);
-
 	Logo->SetImage(Image::LoadResource("widgets/banner.png"));
 }
 
-void LauncherBanner::UpdateLanguage()
-{
-	FString versionText = GStrings.GetString("PICKER_VERSION");
-	versionText.Substitute("%s", GetVersionString());
-	VersionLabel->SetText(versionText.GetChars());
-}
-
 double LauncherBanner::GetPreferredHeight() const
 {
 	return Logo->GetPreferredHeight();
@@ -30,5 +20,4 @@ double LauncherBanner::GetPreferredHeight() const
 void LauncherBanner::OnGeometryChanged()
 {
 	Logo->SetFrameGeometry(0.0, 0.0, GetWidth(), Logo->GetPreferredHeight());
-	VersionLabel->SetFrameGeometry(20.0, GetHeight() - 10.0 - VersionLabel->GetPreferredHeight(), GetWidth() - 40.0, VersionLabel->GetPreferredHeight());
 }
diff --git a/src/launcher/launcherbanner.h b/src/launcher/launcherbanner.h
index 9a27a5694..0bfee5c99 100644
--- a/src/launcher/launcherbanner.h
+++ b/src/launcher/launcherbanner.h
@@ -9,7 +9,6 @@ class LauncherBanner : public Widget
 {
 public:
 	LauncherBanner(Widget* parent);
-	void UpdateLanguage();
 
 	double GetPreferredHeight() const;
 
@@ -17,5 +16,4 @@ private:
 	void OnGeometryChanged() override;
 
 	ImageBox* Logo = nullptr;
-	TextLabel* VersionLabel = nullptr;
 };
diff --git a/src/launcher/launcherwindow.cpp b/src/launcher/launcherwindow.cpp
index c4b84df82..b60db7cf8 100644
--- a/src/launcher/launcherwindow.cpp
+++ b/src/launcher/launcherwindow.cpp
@@ -68,7 +68,6 @@ void LauncherWindow::UpdateLanguage()
 {
 	Pages->SetTabText(PlayGame, GStrings.GetString("PICKER_TAB_PLAY"));
 	Pages->SetTabText(Settings, GStrings.GetString("OPTMNU_TITLE"));
-	Banner->UpdateLanguage();
 	PlayGame->UpdateLanguage();
 	Settings->UpdateLanguage();
 	Buttonbar->UpdateLanguage();
diff --git a/src/launcher/playgamepage.cpp b/src/launcher/playgamepage.cpp
index 84ac64ad1..53676b94e 100644
--- a/src/launcher/playgamepage.cpp
+++ b/src/launcher/playgamepage.cpp
@@ -11,6 +11,8 @@
 PlayGamePage::PlayGamePage(LauncherWindow* launcher, WadStuff* wads, int numwads, int defaultiwad) : Widget(nullptr), Launcher(launcher)
 {
 	WelcomeLabel = new TextLabel(this);
+	VersionLabel = new TextLabel(this);
+	VersionLabel->SetTextAlignment(TextLabelAlignment::Right);
 	SelectLabel = new TextLabel(this);
 	ParametersLabel = new TextLabel(this);
 	GamesList = new ListView(this);
@@ -62,6 +64,9 @@ void PlayGamePage::UpdateLanguage()
 	FString welcomeText = GStrings.GetString("PICKER_WELCOME");
 	welcomeText.Substitute("%s", GAMENAME);
 	WelcomeLabel->SetText(welcomeText.GetChars());
+	FString versionText = GStrings.GetString("PICKER_VERSION");
+	versionText.Substitute("%s", GetVersionString());
+	VersionLabel->SetText(versionText.GetChars());
 }
 
 void PlayGamePage::OnGamesListActivated()
@@ -81,6 +86,8 @@ void PlayGamePage::OnGeometryChanged()
 	WelcomeLabel->SetFrameGeometry(0.0, y, GetWidth(), WelcomeLabel->GetPreferredHeight());
 	y += WelcomeLabel->GetPreferredHeight();
 
+	VersionLabel->SetFrameGeometry(20.0, y - VersionLabel->GetPreferredHeight(), GetWidth() - 19.0, VersionLabel->GetPreferredHeight());
+
 	y += 10.0;
 
 	SelectLabel->SetFrameGeometry(0.0, y, GetWidth(), SelectLabel->GetPreferredHeight());
diff --git a/src/launcher/playgamepage.h b/src/launcher/playgamepage.h
index 79e92e67b..dd3bd170a 100644
--- a/src/launcher/playgamepage.h
+++ b/src/launcher/playgamepage.h
@@ -27,6 +27,7 @@ private:
 	LauncherWindow* Launcher = nullptr;
 
 	TextLabel* WelcomeLabel = nullptr;
+	TextLabel* VersionLabel = nullptr;
 	TextLabel* SelectLabel = nullptr;
 	TextLabel* ParametersLabel = nullptr;
 	ListView* GamesList = nullptr;