popout: fully unload popout layers on close

quickshell/DMSShell.qml

@@ -271,6 +271,7 @@ Item {
         sourceComponent: Component {
             DankDashPopout {
                 id: dankDashPopout
+                onPopoutClosed: PopoutService.unloadDankDash()
             }
         }
     }
@@ -290,8 +291,13 @@ Item {
 
         active: false
 
+        Component.onCompleted: {
+            PopoutService.notificationCenterLoader = notificationCenterLoader;
+        }
+
         NotificationCenterPopout {
             id: notificationCenter
+            onPopoutClosed: PopoutService.unloadNotificationCenter()
 
             Component.onCompleted: {
                 PopoutService.notificationCenterPopout = notificationCenter;
@@ -315,10 +321,15 @@ Item {
         property var modalRef: colorPickerModal
         property LazyLoader powerModalLoaderRef: powerMenuModalLoader
 
+        Component.onCompleted: {
+            PopoutService.controlCenterLoader = controlCenterLoader;
+        }
+
         ControlCenterPopout {
             id: controlCenterPopout
             colorPickerModal: controlCenterLoader.modalRef
             powerMenuModalLoader: controlCenterLoader.powerModalLoaderRef
+            onPopoutClosed: PopoutService.unloadControlCenter()
 
             onLockRequested: {
                 lock.activate();
@@ -443,8 +454,13 @@ Item {
 
         active: false
 
+        Component.onCompleted: {
+            PopoutService.batteryPopoutLoader = batteryPopoutLoader;
+        }
+
         BatteryPopout {
             id: batteryPopout
+            onPopoutClosed: PopoutService.unloadBattery()
 
             Component.onCompleted: {
                 PopoutService.batteryPopout = batteryPopout;
@@ -457,8 +473,13 @@ Item {
 
         active: false
 
+        Component.onCompleted: {
+            PopoutService.layoutPopoutLoader = layoutPopoutLoader;
+        }
+
         DWLLayoutPopout {
             id: layoutPopout
+            onPopoutClosed: PopoutService.unloadLayoutPopout()
 
             Component.onCompleted: {
                 PopoutService.layoutPopout = layoutPopout;
@@ -471,8 +492,13 @@ Item {
 
         active: false
 
+        Component.onCompleted: {
+            PopoutService.vpnPopoutLoader = vpnPopoutLoader;
+        }
+
         VpnPopout {
             id: vpnPopout
+            onPopoutClosed: PopoutService.unloadVpn()
 
             Component.onCompleted: {
                 PopoutService.vpnPopout = vpnPopout;
@@ -485,8 +511,13 @@ Item {
 
         active: false
 
+        Component.onCompleted: {
+            PopoutService.processListPopoutLoader = processListPopoutLoader;
+        }
+
         ProcessListPopout {
             id: processListPopout
+            onPopoutClosed: PopoutService.unloadProcessListPopout()
 
             Component.onCompleted: {
                 PopoutService.processListPopout = processListPopout;
@@ -529,8 +560,13 @@ Item {
 
         active: false
 
+        Component.onCompleted: {
+            PopoutService.appDrawerLoader = appDrawerLoader;
+        }
+
         AppDrawerPopout {
             id: appDrawerPopout
+            onPopoutClosed: PopoutService.unloadAppDrawer()
 
             Component.onCompleted: {
                 PopoutService.appDrawerPopout = appDrawerPopout;
@@ -562,8 +598,13 @@ Item {
 
         active: false
 
+        Component.onCompleted: {
+            PopoutService.clipboardHistoryPopoutLoader = clipboardHistoryPopoutLoader;
+        }
+
         ClipboardHistoryPopout {
             id: clipboardHistoryPopout
+            onPopoutClosed: PopoutService.unloadClipboardHistoryPopout()
 
             Component.onCompleted: {
                 PopoutService.clipboardHistoryPopout = clipboardHistoryPopout;
@@ -738,8 +779,13 @@ Item {
 
         active: false
 
+        Component.onCompleted: {
+            PopoutService.systemUpdateLoader = systemUpdateLoader;
+        }
+
         SystemUpdatePopout {
             id: systemUpdatePopout
+            onPopoutClosed: PopoutService.unloadSystemUpdate()
 
             Component.onCompleted: {
                 PopoutService.systemUpdatePopout = systemUpdatePopout;

quickshell/Modules/DankBar/DankBarContent.qml

@@ -561,10 +561,7 @@ Item {
             axis: barWindow.axis
             section: topBarContent.getWidgetSection(parent)
             parentScreen: barWindow.screen
-            popoutTarget: {
+            popoutTarget: clipboardHistoryPopoutLoader.item ?? null
-                clipboardHistoryPopoutLoader.active = true;
-                return clipboardHistoryPopoutLoader.item;
-            }
 
             function openClipboardPopout(initialTab) {
                 clipboardHistoryPopoutLoader.active = true;
@@ -759,10 +756,7 @@ Item {
             barThickness: barWindow.effectiveBarThickness
             widgetThickness: barWindow.widgetThickness
             section: topBarContent.getWidgetSection(parent) || "center"
-            popoutTarget: {
+            popoutTarget: dankDashPopoutLoader.item ?? null
-                dankDashPopoutLoader.active = true;
-                return dankDashPopoutLoader.item;
-            }
             parentScreen: barWindow.screen
 
             Component.onCompleted: {
@@ -826,10 +820,7 @@ Item {
             barThickness: barWindow.effectiveBarThickness
             widgetThickness: barWindow.widgetThickness
             section: topBarContent.getWidgetSection(parent) || "center"
-            popoutTarget: {
+            popoutTarget: dankDashPopoutLoader.item ?? null
-                dankDashPopoutLoader.active = true;
-                return dankDashPopoutLoader.item;
-            }
             parentScreen: barWindow.screen
             onClicked: {
                 dankDashPopoutLoader.active = true;
@@ -881,10 +872,7 @@ Item {
             barThickness: barWindow.effectiveBarThickness
             widgetThickness: barWindow.widgetThickness
             section: topBarContent.getWidgetSection(parent) || "center"
-            popoutTarget: {
+            popoutTarget: dankDashPopoutLoader.item ?? null
-                dankDashPopoutLoader.active = true;
-                return dankDashPopoutLoader.item;
-            }
             parentScreen: barWindow.screen
             onClicked: {
                 dankDashPopoutLoader.active = true;
@@ -968,10 +956,7 @@ Item {
             widgetThickness: barWindow.widgetThickness
             axis: barWindow.axis
             section: topBarContent.getWidgetSection(parent) || "right"
-            popoutTarget: {
+            popoutTarget: processListPopoutLoader.item ?? null
-                processListPopoutLoader.active = true;
-                return processListPopoutLoader.item;
-            }
             parentScreen: barWindow.screen
             widgetData: parent.widgetData
             onCpuClicked: {
@@ -1004,10 +989,7 @@ Item {
             widgetThickness: barWindow.widgetThickness
             axis: barWindow.axis
             section: topBarContent.getWidgetSection(parent) || "right"
-            popoutTarget: {
+            popoutTarget: processListPopoutLoader.item ?? null
-                processListPopoutLoader.active = true;
-                return processListPopoutLoader.item;
-            }
             parentScreen: barWindow.screen
             widgetData: parent.widgetData
             onRamClicked: {
@@ -1054,10 +1036,7 @@ Item {
             widgetThickness: barWindow.widgetThickness
             axis: barWindow.axis
             section: topBarContent.getWidgetSection(parent) || "right"
-            popoutTarget: {
+            popoutTarget: processListPopoutLoader.item ?? null
-                processListPopoutLoader.active = true;
-                return processListPopoutLoader.item;
-            }
             parentScreen: barWindow.screen
             widgetData: parent.widgetData
             onCpuTempClicked: {
@@ -1090,10 +1069,7 @@ Item {
             widgetThickness: barWindow.widgetThickness
             axis: barWindow.axis
             section: topBarContent.getWidgetSection(parent) || "right"
-            popoutTarget: {
+            popoutTarget: processListPopoutLoader.item ?? null
-                processListPopoutLoader.active = true;
-                return processListPopoutLoader.item;
-            }
             parentScreen: barWindow.screen
             widgetData: parent.widgetData
             onGpuTempClicked: {
@@ -1134,10 +1110,7 @@ Item {
             barThickness: barWindow.effectiveBarThickness
             axis: barWindow.axis
             section: topBarContent.getWidgetSection(parent) || "right"
-            popoutTarget: {
+            popoutTarget: notificationCenterLoader.item ?? null
-                notificationCenterLoader.active = true;
-                return notificationCenterLoader.item;
-            }
             parentScreen: barWindow.screen
             onClicked: {
                 notificationCenterLoader.active = true;
@@ -1172,10 +1145,7 @@ Item {
             section: topBarContent.getWidgetSection(parent) || "right"
             barSpacing: barConfig?.spacing ?? 4
             barConfig: topBarContent.barConfig
-            popoutTarget: {
+            popoutTarget: batteryPopoutLoader.item ?? null
-                batteryPopoutLoader.active = true;
-                return batteryPopoutLoader.item;
-            }
             parentScreen: barWindow.screen
             onToggleBatteryPopup: {
                 batteryPopoutLoader.active = true;
@@ -1208,10 +1178,7 @@ Item {
             barThickness: barWindow.effectiveBarThickness
             axis: barWindow.axis
             section: topBarContent.getWidgetSection(parent) || "center"
-            popoutTarget: {
+            popoutTarget: layoutPopoutLoader.item ?? null
-                layoutPopoutLoader.active = true;
-                return layoutPopoutLoader.item;
-            }
             parentScreen: barWindow.screen
             onToggleLayoutPopup: {
                 layoutPopoutLoader.active = true;
@@ -1244,10 +1211,7 @@ Item {
             barSpacing: barConfig?.spacing ?? 4
             barConfig: topBarContent.barConfig
             isAutoHideBar: topBarContent.barConfig?.autoHide ?? false
-            popoutTarget: {
+            popoutTarget: vpnPopoutLoader.item ?? null
-                vpnPopoutLoader.active = true;
-                return vpnPopoutLoader.item;
-            }
             parentScreen: barWindow.screen
             onToggleVpnPopup: {
                 vpnPopoutLoader.active = true;
@@ -1281,10 +1245,7 @@ Item {
             barThickness: barWindow.effectiveBarThickness
             axis: barWindow.axis
             section: topBarContent.getWidgetSection(parent) || "right"
-            popoutTarget: {
+            popoutTarget: controlCenterLoader.item ?? null
-                controlCenterLoader.active = true;
-                return controlCenterLoader.item;
-            }
             parentScreen: barWindow.screen
             screenName: barWindow.screen?.name || ""
             screenModel: barWindow.screen?.model || ""
@@ -1434,10 +1395,7 @@ Item {
             barThickness: barWindow.effectiveBarThickness
             axis: barWindow.axis
             section: topBarContent.getWidgetSection(parent) || "right"
-            popoutTarget: {
+            popoutTarget: systemUpdateLoader.item ?? null
-                systemUpdateLoader.active = true;
-                return systemUpdateLoader.item;
-            }
             parentScreen: barWindow.screen
             onClicked: {
                 systemUpdateLoader.active = true;

quickshell/Services/PopoutService.qml

@@ -9,19 +9,29 @@ Singleton {
     id: root
 
     property var controlCenterPopout: null
+    property var controlCenterLoader: null
     property var notificationCenterPopout: null
+    property var notificationCenterLoader: null
     property var appDrawerPopout: null
+    property var appDrawerLoader: null
     property var processListPopout: null
+    property var processListPopoutLoader: null
     property var dankDashPopout: null
     property var dankDashPopoutLoader: null
     property var batteryPopout: null
+    property var batteryPopoutLoader: null
     property var vpnPopout: null
+    property var vpnPopoutLoader: null
     property var systemUpdatePopout: null
+    property var systemUpdateLoader: null
+    property var layoutPopout: null
+    property var layoutPopoutLoader: null
+    property var clipboardHistoryPopout: null
+    property var clipboardHistoryPopoutLoader: null
 
     property var settingsModal: null
     property var settingsModalLoader: null
     property var clipboardHistoryModal: null
-    property var clipboardHistoryPopout: null
     property var dankLauncherV2Modal: null
     property var dankLauncherV2ModalLoader: null
     property var powerMenuModal: null
@@ -61,6 +71,13 @@ Singleton {
         controlCenterPopout?.close();
     }
 
+    function unloadControlCenter() {
+        if (!controlCenterLoader)
+            return;
+        controlCenterPopout = null;
+        controlCenterLoader.active = false;
+    }
+
     function toggleControlCenter(x, y, width, section, screen) {
         if (controlCenterPopout) {
             setPosition(controlCenterPopout, x, y, width, section, screen);
@@ -79,6 +96,13 @@ Singleton {
         notificationCenterPopout?.close();
     }
 
+    function unloadNotificationCenter() {
+        if (!notificationCenterLoader)
+            return;
+        notificationCenterPopout = null;
+        notificationCenterLoader.active = false;
+    }
+
     function toggleNotificationCenter(x, y, width, section, screen) {
         if (notificationCenterPopout) {
             setPosition(notificationCenterPopout, x, y, width, section, screen);
@@ -97,6 +121,13 @@ Singleton {
         appDrawerPopout?.close();
     }
 
+    function unloadAppDrawer() {
+        if (!appDrawerLoader)
+            return;
+        appDrawerPopout = null;
+        appDrawerLoader.active = false;
+    }
+
     function toggleAppDrawer(x, y, width, section, screen) {
         if (appDrawerPopout) {
             setPosition(appDrawerPopout, x, y, width, section, screen);
@@ -115,6 +146,13 @@ Singleton {
         processListPopout?.close();
     }
 
+    function unloadProcessListPopout() {
+        if (!processListPopoutLoader)
+            return;
+        processListPopout = null;
+        processListPopoutLoader.active = false;
+    }
+
     function toggleProcessList(x, y, width, section, screen) {
         if (processListPopout) {
             setPosition(processListPopout, x, y, width, section, screen);
@@ -163,6 +201,13 @@ Singleton {
             dankDashPopout.dashVisible = false;
     }
 
+    function unloadDankDash() {
+        if (!dankDashPopoutLoader)
+            return;
+        dankDashPopout = null;
+        dankDashPopoutLoader.active = false;
+    }
+
     function toggleDankDash(tabIndex, x, y, width, section, screen) {
         _dankDashPendingTab = tabIndex || 0;
         if (dankDashPopout) {
@@ -219,6 +264,13 @@ Singleton {
         batteryPopout?.close();
     }
 
+    function unloadBattery() {
+        if (!batteryPopoutLoader)
+            return;
+        batteryPopout = null;
+        batteryPopoutLoader.active = false;
+    }
+
     function toggleBattery(x, y, width, section, screen) {
         if (batteryPopout) {
             setPosition(batteryPopout, x, y, width, section, screen);
@@ -237,6 +289,13 @@ Singleton {
         vpnPopout?.close();
     }
 
+    function unloadVpn() {
+        if (!vpnPopoutLoader)
+            return;
+        vpnPopout = null;
+        vpnPopoutLoader.active = false;
+    }
+
     function toggleVpn(x, y, width, section, screen) {
         if (vpnPopout) {
             setPosition(vpnPopout, x, y, width, section, screen);
@@ -255,6 +314,13 @@ Singleton {
         systemUpdatePopout?.close();
     }
 
+    function unloadSystemUpdate() {
+        if (!systemUpdateLoader)
+            return;
+        systemUpdatePopout = null;
+        systemUpdateLoader.active = false;
+    }
+
     function toggleSystemUpdate(x, y, width, section, screen) {
         if (systemUpdatePopout) {
             setPosition(systemUpdatePopout, x, y, width, section, screen);
@@ -415,6 +481,20 @@ Singleton {
         clipboardHistoryModal?.close();
     }
 
+    function unloadClipboardHistoryPopout() {
+        if (!clipboardHistoryPopoutLoader)
+            return;
+        clipboardHistoryPopout = null;
+        clipboardHistoryPopoutLoader.active = false;
+    }
+
+    function unloadLayoutPopout() {
+        if (!layoutPopoutLoader)
+            return;
+        layoutPopout = null;
+        layoutPopoutLoader.active = false;
+    }
+
     property bool _dankLauncherV2WantsOpen: false
     property bool _dankLauncherV2WantsToggle: false
     property string _dankLauncherV2PendingQuery: ""