Merge pull request #2690: decouple widget click from sort state

Resolve conflict by adopting upstream openWidgetPopout() abstraction
with tabIndex: 1 (CPU) and tabIndex: 3 (GPU) routing.

Preserve async race condition fix in PopoutService (Connections on
Loader.Ready instead of Qt.callLater) and toggle->show delegation
in ProcessListModal.

Author: louzt

quickshell/Modals/ProcessListModal.qml

@@ -13,6 +13,11 @@ FloatingWindow {
 
     property bool disablePopupTransparency: true
     property int currentTab: 0
+    // Number of tabs in the tab bar — derived from the tab model array.
+    // Using array literal length (4) as a constant property; matches the
+    // inline Repeater model so the bound stays correct if tabs are added.
+    readonly property int tabCount: 4
+    readonly property int maxTabIndex: tabCount - 1
     property string searchText: ""
     property string expandedPid: ""
     property string processFilter: "all"
@@ -21,11 +26,25 @@ FloatingWindow {
 
     signal closingModal
 
-    function show() {
+    function clampTab(tabIndex) {
+        if (tabIndex === undefined || tabIndex === null)
+            return currentTab;
+        return Math.max(0, Math.min(maxTabIndex, tabIndex));
+    }
+
+    function show(tabIndex) {
         if (!DgopService.dgopAvailable) {
             log.warn("dgop is not available");
             return;
         }
+        currentTab = clampTab(tabIndex);
+        // Restore sort state when navigating to Performance tab (tab 1).
+        // CpuMonitor and RamMonitor call setSortBy themselves; routing here
+        // from a thermal widget should also set the sort so the data is
+        // pre-sorted for the tab being opened.
+        if (currentTab === 1) {
+            DgopService.setSortBy("cpu");
+        }
         visible = true;
     }
 
@@ -35,12 +54,18 @@ FloatingWindow {
             processContextMenu.close();
     }
 
-    function toggle() {
+    function toggle(tabIndex) {
         if (!DgopService.dgopAvailable) {
             log.warn("dgop is not available");
             return;
         }
-        visible = !visible;
+        // If already visible on the target tab, just hide.
+        // Otherwise delegate to show() which handles clampTab, sort state, and visibility.
+        if (visible && currentTab === clampTab(tabIndex)) {
+            hide();
+            return;
+        }
+        show(tabIndex);
     }
 
     function focusOrToggle() {
@@ -78,11 +103,11 @@ FloatingWindow {
     }
 
     function nextTab() {
-        currentTab = (currentTab + 1) % 4;
+        currentTab = (currentTab + 1) % tabCount;
     }
 
     function previousTab() {
-        currentTab = (currentTab - 1 + 4) % 4;
+        currentTab = (currentTab - 1 + tabCount) % tabCount;
     }
 
     objectName: "processListModal"

quickshell/Modules/DankBar/DankBarContent.qml

@@ -1285,6 +1285,7 @@ Item {
                     widgetItem: cpuTempWidget,
                     section: topBarContent.getWidgetSection(parent) || "right",
                     triggerSource: "cpu_temp",
+                    tabIndex: 1,
                     mode: "click"
                 });
             }
@@ -1309,6 +1310,7 @@ Item {
                     widgetItem: gpuTempWidget,
                     section: topBarContent.getWidgetSection(parent) || "right",
                     triggerSource: "gpu_temp",
+                    tabIndex: 3,
                     mode: "click"
                 });
             }

quickshell/Modules/DankBar/Widgets/CpuTemperature.qml

@@ -133,7 +133,6 @@ BasePill {
         acceptedButtons: Qt.LeftButton
         onPressed: mouse => {
             root.triggerRipple(this, mouse.x, mouse.y);
-            DgopService.setSortBy("cpu");
             cpuTempClicked();
         }
     }

quickshell/Modules/DankBar/Widgets/GpuTemperature.qml

@@ -201,7 +201,6 @@ BasePill {
         acceptedButtons: Qt.LeftButton
         onPressed: mouse => {
             root.triggerRipple(this, mouse.x, mouse.y);
-            DgopService.setSortBy("cpu");
             gpuTempClicked();
         }
     }

quickshell/Services/PopoutService.qml

@@ -39,6 +39,8 @@ Singleton {
     property var powerMenuModal: null
     property var processListModal: null
     property var processListModalLoader: null
+    // Pending tab index for async Loader path — consumed by Connections when modal loads
+    property int pendingProcessTab: -1
     property var colorPickerModal: null
     property var notificationModal: null
     property var wifiPasswordModal: null
@@ -759,12 +761,12 @@ Singleton {
         }
     }
 
-    function showProcessListModal() {
+    function showProcessListModal(tabIndex) {
         if (processListModal) {
-            processListModal.show();
+            processListModal.show(tabIndex);
         } else if (processListModalLoader) {
+            pendingProcessTab = (tabIndex !== undefined && tabIndex !== null) ? tabIndex : -1;
             processListModalLoader.active = true;
-            Qt.callLater(() => processListModal?.show());
         }
     }
 
@@ -779,12 +781,26 @@ Singleton {
         }
     }
 
-    function toggleProcessListModal() {
+    function toggleProcessListModal(tabIndex) {
         if (processListModal) {
-            processListModal.toggle();
+            processListModal.toggle(tabIndex);
         } else if (processListModalLoader) {
+            pendingProcessTab = (tabIndex !== undefined && tabIndex !== null) ? tabIndex : -1;
             processListModalLoader.active = true;
-            Qt.callLater(() => processListModal?.show());
+        }
+    }
+
+    // Reactive async path: when Loader finishes loading, show modal at pending tab.
+    // Avoids Qt.callLater race condition where the lambda fires before modal is ready.
+    Connections {
+        target: processListModalLoader
+        function onStatusChanged() {
+            if (!processListModalLoader)
+                return;
+            if (processListModalLoader.status === Loader.Ready && pendingProcessTab !== -1) {
+                processListModal?.show(pendingProcessTab);
+                pendingProcessTab = -1;
+            }
         }
     }