From 0f42f3cc5ca269b4e4002d74299e9aa9713a08c5 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat, 25 Nov 2023 16:48:51 +0200
Subject: [PATCH] Added warning regarding maximized option

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/BaseInstance.cpp                           |  5 +++++
 launcher/BaseInstance.h                             |  2 ++
 launcher/minecraft/MinecraftInstance.cpp            |  4 ++--
 launcher/ui/pages/global/MinecraftPage.ui           | 10 ++++++++++
 launcher/ui/pages/instance/InstanceSettingsPage.cpp |  1 +
 launcher/ui/pages/instance/InstanceSettingsPage.ui  | 12 +++++++++++-
 6 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/launcher/BaseInstance.cpp b/launcher/BaseInstance.cpp
index 69cf95e3c..ccfd0b847 100644
--- a/launcher/BaseInstance.cpp
+++ b/launcher/BaseInstance.cpp
@@ -411,3 +411,8 @@ void BaseInstance::updateRuntimeContext()
 {
     // NOOP
 }
+
+bool BaseInstance::isLegacy()
+{
+    return traits().contains("legacyLaunch") || traits().contains("alphaLaunch");
+}
diff --git a/launcher/BaseInstance.h b/launcher/BaseInstance.h
index 2be28d1ec..9827a08b4 100644
--- a/launcher/BaseInstance.h
+++ b/launcher/BaseInstance.h
@@ -269,6 +269,8 @@ class BaseInstance : public QObject, public std::enable_shared_from_this<BaseIns
     bool removeLinkedInstanceId(const QString& id);
     bool isLinkedToInstanceId(const QString& id) const;
 
+    bool isLegacy();
+
    protected:
     void changeStatus(Status newStatus);
 
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index d3f7cc20e..5be3802bc 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -533,7 +533,7 @@ QStringList MinecraftInstance::javaArguments()
 QString MinecraftInstance::getLauncher()
 {
     // use legacy launcher if the traits are set
-    if (traits().contains("legacyLaunch") || traits().contains("alphaLaunch"))
+    if (isLegacy())
         return "legacy";
 
     return "standard";
@@ -757,7 +757,7 @@ QString MinecraftInstance::createLaunchScript(AuthSessionPtr session, MinecraftT
         QString windowParams;
         if (settings()->get("LaunchMaximized").toBool()) {
             // FIXME doesn't support maximisation
-            if (getLauncher() == "standard") {
+            if (!isLegacy()) {
                 auto screen = QGuiApplication::primaryScreen();
                 auto screenGeometry = screen->availableSize();
 
diff --git a/launcher/ui/pages/global/MinecraftPage.ui b/launcher/ui/pages/global/MinecraftPage.ui
index 7d2741250..3a28c92c7 100644
--- a/launcher/ui/pages/global/MinecraftPage.ui
+++ b/launcher/ui/pages/global/MinecraftPage.ui
@@ -55,6 +55,16 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QLabel" name="maximizedWarning">
+            <property name="toolTip">
+             <string>On newer versions the game only supports resolution. In order to simulate the maximized behaviour the current implementation approximates the maximum display size.</string>
+            </property>
+            <property name="text">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#f5c211;&quot;&gt;Warning&lt;/span&gt;&lt;span style=&quot; color:#f5c211;&quot;&gt;: On the newer Minecraft versions the start maximized option is not fully supported.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+           </widget>
+          </item>
           <item>
            <layout class="QGridLayout" name="gridLayoutWindowSize">
             <item row="1" column="0">
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.cpp b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
index cf8d86cd4..1a5be050f 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.cpp
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
@@ -323,6 +323,7 @@ void InstanceSettingsPage::loadSettings()
     // Window Size
     ui->windowSizeGroupBox->setChecked(m_settings->get("OverrideWindow").toBool());
     ui->maximizedCheckBox->setChecked(m_settings->get("LaunchMaximized").toBool());
+    ui->maximizedWarning->setVisible(m_settings->get("LaunchMaximized").toBool() && !m_instance->isLegacy());
     ui->windowWidthSpinBox->setValue(m_settings->get("MinecraftWinWidth").toInt());
     ui->windowHeightSpinBox->setValue(m_settings->get("MinecraftWinHeight").toInt());
 
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.ui b/launcher/ui/pages/instance/InstanceSettingsPage.ui
index 4905eae87..e5ef98b00 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.ui
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.ui
@@ -36,7 +36,7 @@
    <item>
     <widget class="QTabWidget" name="settingsTabs">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="minecraftPage">
       <attribute name="title">
@@ -285,6 +285,16 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QLabel" name="maximizedWarning">
+            <property name="toolTip">
+             <string>The base game only supports resolution. In order to simulate the maximized behaviour the current implementation approximates the maximum display size..</string>
+            </property>
+            <property name="text">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#f5c211;&quot;&gt;Warning&lt;/span&gt;&lt;span style=&quot; color:#f5c211;&quot;&gt;: The maximized option may not be fully supported for the current minecraft version.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+           </widget>
+          </item>
           <item>
            <layout class="QGridLayout" name="gridLayoutWindowSize">
             <item row="1" column="0">