From b180325691dcf45c7df1574c0e3e6c62e051b510 Mon Sep 17 00:00:00 2001
From: ItsLemmy <studio@quadbyte.net>
Date: Fri, 7 Nov 2025 16:11:12 -0500
Subject: [PATCH] SetupWizard: Improved kickstart and fixed odd size on tiny
 screens.

---
 Modules/Panels/SetupWizard/SetupWizard.qml |  4 +-
 shell.qml                                  | 48 ++++++++++------------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/Modules/Panels/SetupWizard/SetupWizard.qml b/Modules/Panels/SetupWizard/SetupWizard.qml
index 466f618d5..74dd1fb38 100644
--- a/Modules/Panels/SetupWizard/SetupWizard.qml
+++ b/Modules/Panels/SetupWizard/SetupWizard.qml
@@ -11,8 +11,8 @@ import qs.Modules.MainScreen
 SmartPanel {
   id: root
 
-  preferredWidth: Math.round(520 * Style.uiScaleRatio)
-  preferredHeight: Math.round(600 * Style.uiScaleRatio)
+  preferredWidth: Math.round(preferredWidthRatio * 2560 * Style.uiScaleRatio)
+  preferredHeight: Math.round(preferredHeightRatio * 1440 * Style.uiScaleRatio)
   preferredWidthRatio: 0.4
   preferredHeightRatio: 0.6
 
diff --git a/shell.qml b/shell.qml
index 009103371..3f433162a 100644
--- a/shell.qml
+++ b/shell.qml
@@ -74,6 +74,11 @@ ShellRoot {
         IdleInhibitorService.init()
         PowerProfileService.init()
         DistroService.init()
+
+        // Only open the setup wizard for new users
+        if (!Settings.data.setupCompleted) {
+          checkSetupWizard()
+        }
       }
 
       Overview {}
@@ -100,17 +105,6 @@ ShellRoot {
     }
   }
 
-  // Setup Wizard - Auto Kick start
-  Connections {
-    target: Settings
-    function onSettingsLoaded() {
-      // Only open the setup wizard for new users
-      if (!Settings.data.setupCompleted) {
-        checkSetupWizard()
-      }
-    }
-  }
-
   function checkSetupWizard() {
     // Wait for distro service
     if (!DistroService.isReady) {
@@ -125,23 +119,25 @@ ShellRoot {
     }
 
     if (Settings.data.settingsVersion >= Settings.settingsVersion) {
-      // Open Setup Wizard as a panel in the same windowing system as Settings/ControlCenter
-      if (Quickshell.screens.length > 0) {
-        var targetScreen = Quickshell.screens[0]
-        var setupPanel = PanelService.getPanel("setupWizardPanel", targetScreen)
-        if (setupPanel) {
-          setupPanel.open()
-        } else {
-          // If not yet loaded, ensure it loads and try again shortly
-          Qt.callLater(() => {
-                         var sp = PanelService.getPanel("setupWizardPanel", targetScreen)
-                         if (sp)
-                         sp.open()
-                       })
-        }
-      }
+      showSetupWizard()
     } else {
       Settings.data.setupCompleted = true
     }
   }
+
+  function showSetupWizard() {
+    // Open Setup Wizard as a panel in the same windowing system as Settings/ControlCenter
+    if (Quickshell.screens.length > 0) {
+      var targetScreen = Quickshell.screens[0]
+      var setupPanel = PanelService.getPanel("setupWizardPanel", targetScreen)
+      if (setupPanel) {
+        setupPanel.open()
+      } else {
+        // If not yet loaded, ensure it loads and try again shortly
+        Qt.callLater(() => {
+                       showSetupWizard()
+                     })
+      }
+    }
+  }
 }