From 5a76d9b7e11596a3133fe46fafad24c8735039d2 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Tue, 4 Feb 2025 17:05:20 +0000
Subject: [PATCH] Make requested changes

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/ui/pages/global/JavaPage.cpp         |  5 +---
 launcher/ui/pages/global/JavaPage.h           |  1 -
 launcher/ui/pages/global/JavaPage.ui          | 11 +++++++++
 launcher/ui/pages/global/LauncherPage.ui      | 10 ++++----
 launcher/ui/widgets/JavaSettingsWidget.cpp    | 23 +++++++++----------
 launcher/ui/widgets/JavaSettingsWidget.h      |  5 ++--
 .../ui/widgets/MinecraftSettingsWidget.cpp    |  6 ++---
 7 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/launcher/ui/pages/global/JavaPage.cpp b/launcher/ui/pages/global/JavaPage.cpp
index 9f681c6f1..b99d0c63e 100644
--- a/launcher/ui/pages/global/JavaPage.cpp
+++ b/launcher/ui/pages/global/JavaPage.cpp
@@ -63,9 +63,6 @@ JavaPage::JavaPage(QWidget* parent) : QWidget(parent), ui(new Ui::JavaPage)
 {
     ui->setupUi(this);
     
-    m_javaSettings = new JavaSettingsWidget(nullptr, this);
-    ui->generalScrollArea->setWidget(m_javaSettings);
-
     if (BuildConfig.JAVA_DOWNLOADER_ENABLED) {
         ui->managedJavaList->initialize(new JavaInstallList(this, true));
         ui->managedJavaList->setResizeOn(2);
@@ -88,7 +85,7 @@ void JavaPage::retranslate()
 
 bool JavaPage::apply()
 {
-    m_javaSettings->saveSettings();
+    ui->javaSettings->saveSettings();
     JavaCommon::checkJVMArgs(APPLICATION->settings()->get("JvmArgs").toString(), this);
     return true;
 }
diff --git a/launcher/ui/pages/global/JavaPage.h b/launcher/ui/pages/global/JavaPage.h
index 75fd69e6a..bfc355d2f 100644
--- a/launcher/ui/pages/global/JavaPage.h
+++ b/launcher/ui/pages/global/JavaPage.h
@@ -71,5 +71,4 @@ class JavaPage : public QWidget, public BasePage {
 
    private:
     Ui::JavaPage* ui;
-    JavaSettingsWidget* m_javaSettings;
 };
diff --git a/launcher/ui/pages/global/JavaPage.ui b/launcher/ui/pages/global/JavaPage.ui
index 9baa2f6f1..a4b2ac203 100644
--- a/launcher/ui/pages/global/JavaPage.ui
+++ b/launcher/ui/pages/global/JavaPage.ui
@@ -53,6 +53,11 @@
             <height>610</height>
            </rect>
           </property>
+          <layout class="QVBoxLayout" name="verticalLayout_4">
+           <item>
+            <widget class="JavaSettingsWidget" name="javaSettings" native="true"/>
+           </item>
+          </layout>
          </widget>
         </widget>
        </item>
@@ -146,6 +151,12 @@
    <header>ui/widgets/VersionSelectWidget.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>JavaSettingsWidget</class>
+   <extends>QWidget</extends>
+   <header>ui/widgets/JavaSettingsWidget.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui
index c36dfdfc6..31c878f3e 100644
--- a/launcher/ui/pages/global/LauncherPage.ui
+++ b/launcher/ui/pages/global/LauncherPage.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>562</width>
+    <width>511</width>
     <height>726</height>
    </rect>
   </property>
@@ -38,7 +38,7 @@
       <enum>QTabWidget::Rounded</enum>
      </property>
      <property name="currentIndex">
-      <number>2</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="featuresTab">
       <attribute name="title">
@@ -58,8 +58,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>570</width>
-            <height>692</height>
+            <width>473</width>
+            <height>770</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_8">
@@ -689,4 +689,4 @@
  <buttongroups>
   <buttongroup name="sortingModeGroup"/>
  </buttongroups>
-</ui>
+</ui>
\ No newline at end of file
diff --git a/launcher/ui/widgets/JavaSettingsWidget.cpp b/launcher/ui/widgets/JavaSettingsWidget.cpp
index 149edcacd..7a5e228fd 100644
--- a/launcher/ui/widgets/JavaSettingsWidget.cpp
+++ b/launcher/ui/widgets/JavaSettingsWidget.cpp
@@ -36,21 +36,20 @@
  */
 
 #include "JavaSettingsWidget.h"
-#include <Application.h>
-#include <BuildConfig.h>
-#include <JavaCommon.h>
-#include <settings/Setting.h>
-#include <ui/java/InstallJavaDialog.h>
 
-#include <FileSystem.h>
-#include <java/JavaInstallList.h>
-#include <java/JavaUtils.h>
-#include <sys.h>
-#include <ui/dialogs/CustomMessageBox.h>
-#include <ui/dialogs/VersionSelectDialog.h>
 #include <QFileDialog>
 #include <QFileInfo>
-#include <memory>
+#include "Application.h"
+#include "BuildConfig.h"
+#include "FileSystem.h"
+#include "JavaCommon.h"
+#include "java/JavaInstallList.h"
+#include "java/JavaUtils.h"
+#include "settings/Setting.h"
+#include "sys.h"
+#include "ui/dialogs/CustomMessageBox.h"
+#include "ui/dialogs/VersionSelectDialog.h"
+#include "ui/java/InstallJavaDialog.h"
 
 #include "ui_JavaSettingsWidget.h"
 
diff --git a/launcher/ui/widgets/JavaSettingsWidget.h b/launcher/ui/widgets/JavaSettingsWidget.h
index 433a5f19f..21a71fb8b 100644
--- a/launcher/ui/widgets/JavaSettingsWidget.h
+++ b/launcher/ui/widgets/JavaSettingsWidget.h
@@ -36,9 +36,9 @@
 
 #pragma once
 
-#include <BaseInstance.h>
-#include <JavaCommon.h>
 #include <QWidget>
+#include "BaseInstance.h"
+#include "JavaCommon.h"
 
 namespace Ui {
 class JavaSettingsWidget;
@@ -48,6 +48,7 @@ class JavaSettingsWidget : public QWidget {
     Q_OBJECT
 
    public:
+    explicit JavaSettingsWidget(QWidget* parent = nullptr) : JavaSettingsWidget(nullptr, nullptr) {}
     explicit JavaSettingsWidget(InstancePtr instance, QWidget* parent = nullptr);
     ~JavaSettingsWidget() override;
 
diff --git a/launcher/ui/widgets/MinecraftSettingsWidget.cpp b/launcher/ui/widgets/MinecraftSettingsWidget.cpp
index 3c5bbebda..16fccb054 100644
--- a/launcher/ui/widgets/MinecraftSettingsWidget.cpp
+++ b/launcher/ui/widgets/MinecraftSettingsWidget.cpp
@@ -50,13 +50,11 @@ MinecraftSettingsWidget::MinecraftSettingsWidget(MinecraftInstancePtr instance,
     m_ui->setupUi(this);
 
     if (m_instance == nullptr) {
-        for (int i = 0; i < m_ui->settingsTabs->count(); ++i) {
+        for (int i = m_ui->settingsTabs->count() - 1; i >= 0; --i) {
             const QString name = m_ui->settingsTabs->widget(i)->objectName();
 
-            if (name == "javaPage" || name == "launchPage") {
+            if (name == "javaPage" || name == "launchPage")
                 m_ui->settingsTabs->removeTab(i);
-                --i;
-            }
         }
 
         m_ui->openGlobalSettingsButton->setVisible(false);