dankbar: support multiple bars and per-display bars

- Migrate settings to v2
  - Up to 4 bars
  - Per-bar settings instead of global

quickshell/Common/PopoutManager.qml

@@ -9,155 +9,167 @@ Singleton {
     property var currentPopoutsByScreen: ({})
     property var currentPopoutTriggers: ({})
 
-    function showPopout(popout) {
-        if (!popout || !popout.screen) return
+    signal popoutOpening
+    signal popoutChanged
 
-        const screenName = popout.screen.name
+    function showPopout(popout) {
+        if (!popout || !popout.screen)
+            return;
+        popoutOpening();
+
+        const screenName = popout.screen.name;
 
         for (const otherScreenName in currentPopoutsByScreen) {
-            const otherPopout = currentPopoutsByScreen[otherScreenName]
-            if (!otherPopout || otherPopout === popout) continue
-
+            const otherPopout = currentPopoutsByScreen[otherScreenName];
+            if (!otherPopout || otherPopout === popout)
+                continue;
             if (otherPopout.dashVisible !== undefined) {
-                otherPopout.dashVisible = false
+                otherPopout.dashVisible = false;
             } else if (otherPopout.notificationHistoryVisible !== undefined) {
-                otherPopout.notificationHistoryVisible = false
+                otherPopout.notificationHistoryVisible = false;
             } else {
-                otherPopout.close()
+                otherPopout.close();
             }
         }
 
-        currentPopoutsByScreen[screenName] = popout
-        ModalManager.closeAllModalsExcept(null)
-        TrayMenuManager.closeAllMenus()
+        currentPopoutsByScreen[screenName] = popout;
+        popoutChanged();
+        ModalManager.closeAllModalsExcept(null);
     }
 
     function hidePopout(popout) {
-        if (!popout || !popout.screen) return
-
-        const screenName = popout.screen.name
+        if (!popout || !popout.screen)
+            return;
+        const screenName = popout.screen.name;
         if (currentPopoutsByScreen[screenName] === popout) {
-            currentPopoutsByScreen[screenName] = null
-            currentPopoutTriggers[screenName] = null
+            currentPopoutsByScreen[screenName] = null;
+            currentPopoutTriggers[screenName] = null;
+            popoutChanged();
         }
     }
 
     function closeAllPopouts() {
         for (const screenName in currentPopoutsByScreen) {
-            const popout = currentPopoutsByScreen[screenName]
-            if (!popout) continue
-
+            const popout = currentPopoutsByScreen[screenName];
+            if (!popout)
+                continue;
             if (popout.dashVisible !== undefined) {
-                popout.dashVisible = false
+                popout.dashVisible = false;
             } else if (popout.notificationHistoryVisible !== undefined) {
-                popout.notificationHistoryVisible = false
+                popout.notificationHistoryVisible = false;
             } else {
-                popout.close()
+                popout.close();
             }
         }
-        currentPopoutsByScreen = {}
+        currentPopoutsByScreen = {};
     }
 
     function getActivePopout(screen) {
-        if (!screen) return null
-        return currentPopoutsByScreen[screen.name] || null
+        if (!screen)
+            return null;
+        return currentPopoutsByScreen[screen.name] || null;
     }
 
     function requestPopout(popout, tabIndex, triggerSource) {
-        if (!popout || !popout.screen) return
+        if (!popout || !popout.screen)
+            return;
+        const screenName = popout.screen.name;
+        const currentPopout = currentPopoutsByScreen[screenName];
+        const triggerId = triggerSource !== undefined ? triggerSource : tabIndex;
 
-        const screenName = popout.screen.name
-        const currentPopout = currentPopoutsByScreen[screenName]
-        const triggerId = triggerSource !== undefined ? triggerSource : tabIndex
+        const willOpen = !(currentPopout === popout && popout.shouldBeVisible && triggerId !== undefined && currentPopoutTriggers[screenName] === triggerId);
+        if (willOpen) {
+            popoutOpening();
+        }
 
-        let justClosedSamePopout = false
+        let justClosedSamePopout = false;
         for (const otherScreenName in currentPopoutsByScreen) {
-            if (otherScreenName === screenName) continue
-            const otherPopout = currentPopoutsByScreen[otherScreenName]
-            if (!otherPopout) continue
-
+            if (otherScreenName === screenName)
+                continue;
+            const otherPopout = currentPopoutsByScreen[otherScreenName];
+            if (!otherPopout)
+                continue;
             if (otherPopout === popout) {
-                justClosedSamePopout = true
+                justClosedSamePopout = true;
             }
 
             if (otherPopout.dashVisible !== undefined) {
-                otherPopout.dashVisible = false
+                otherPopout.dashVisible = false;
             } else if (otherPopout.notificationHistoryVisible !== undefined) {
-                otherPopout.notificationHistoryVisible = false
+                otherPopout.notificationHistoryVisible = false;
             } else {
-                otherPopout.close()
+                otherPopout.close();
             }
         }
 
         if (currentPopout && currentPopout !== popout) {
             if (currentPopout.dashVisible !== undefined) {
-                currentPopout.dashVisible = false
+                currentPopout.dashVisible = false;
             } else if (currentPopout.notificationHistoryVisible !== undefined) {
-                currentPopout.notificationHistoryVisible = false
+                currentPopout.notificationHistoryVisible = false;
             } else {
-                currentPopout.close()
+                currentPopout.close();
             }
         }
 
         if (currentPopout === popout && popout.shouldBeVisible) {
             if (triggerId !== undefined && currentPopoutTriggers[screenName] === triggerId) {
                 if (popout.dashVisible !== undefined) {
-                    popout.dashVisible = false
+                    popout.dashVisible = false;
                 } else if (popout.notificationHistoryVisible !== undefined) {
-                    popout.notificationHistoryVisible = false
+                    popout.notificationHistoryVisible = false;
                 } else {
-                    popout.close()
+                    popout.close();
                 }
-                return
+                return;
             }
 
             if (triggerId === undefined) {
                 if (popout.dashVisible !== undefined) {
-                    popout.dashVisible = false
+                    popout.dashVisible = false;
                 } else if (popout.notificationHistoryVisible !== undefined) {
-                    popout.notificationHistoryVisible = false
+                    popout.notificationHistoryVisible = false;
                 } else {
-                    popout.close()
+                    popout.close();
                 }
-                return
+                return;
             }
 
             if (tabIndex !== undefined && popout.currentTabIndex !== undefined) {
-                popout.currentTabIndex = tabIndex
+                popout.currentTabIndex = tabIndex;
             }
-            currentPopoutTriggers[screenName] = triggerId
-            return
+            currentPopoutTriggers[screenName] = triggerId;
         }
 
-        currentPopoutTriggers[screenName] = triggerId
-        currentPopoutsByScreen[screenName] = popout
+        currentPopoutTriggers[screenName] = triggerId;
+        currentPopoutsByScreen[screenName] = popout;
+        popoutChanged();
 
         if (tabIndex !== undefined && popout.currentTabIndex !== undefined) {
-            popout.currentTabIndex = tabIndex
+            popout.currentTabIndex = tabIndex;
         }
 
         if (currentPopout !== popout) {
-            ModalManager.closeAllModalsExcept(null)
+            ModalManager.closeAllModalsExcept(null);
         }
-        TrayMenuManager.closeAllMenus()
 
         if (justClosedSamePopout) {
             Qt.callLater(() => {
                 if (popout.dashVisible !== undefined) {
-                    popout.dashVisible = true
+                    popout.dashVisible = true;
                 } else if (popout.notificationHistoryVisible !== undefined) {
-                    popout.notificationHistoryVisible = true
+                    popout.notificationHistoryVisible = true;
                 } else {
-                    popout.open()
+                    popout.open();
                 }
-            })
+            });
         } else {
             if (popout.dashVisible !== undefined) {
-                popout.dashVisible = true
+                popout.dashVisible = true;
             } else if (popout.notificationHistoryVisible !== undefined) {
-                popout.notificationHistoryVisible = true
+                popout.notificationHistoryVisible = true;
             } else {
-                popout.open()
+                popout.open();
             }
         }
     }