dankbar: fix widget registration during visibility changes

fixes #1956

quickshell/Modals/Changelog/ChangelogModal.qml

@@ -24,6 +24,8 @@ FloatingWindow {
     color: Theme.surfaceContainer
     visible: false
 
+    onClosed: visible = false
+
     FocusScope {
         id: contentFocusScope
         anchors.fill: parent

quickshell/Modals/FileBrowser/FileBrowserModal.qml

@@ -41,6 +41,8 @@ FloatingWindow {
     color: Theme.surfaceContainer
     visible: false
 
+    onClosed: close()
+
     onVisibleChanged: {
         if (visible) {
             if (parentModal && "shouldHaveFocus" in parentModal) {

quickshell/Modals/Greeter/GreeterModal.qml

@@ -93,6 +93,8 @@ FloatingWindow {
     color: Theme.surfaceContainer
     visible: false
 
+    onClosed: visible = false
+
     Process {
         id: cheatsheetProcess
         running: false

quickshell/Modals/PolkitAuthModal.qml

@@ -32,6 +32,8 @@ FloatingWindow {
     color: Theme.surfaceContainer
     visible: false
 
+    onClosed: hide()
+
     onVisibleChanged: {
         if (visible) {
             Qt.callLater(focusContent);

quickshell/Modals/Settings/SettingsModal.qml

@@ -92,6 +92,8 @@ FloatingWindow {
     color: Theme.surfaceContainer
     visible: false
 
+    onClosed: hide()
+
     onIsCompactModeChanged: {
         enableAnimations = false;
         if (!isCompactMode) {

quickshell/Modals/WindowRuleModal.qml

@@ -32,6 +32,8 @@ FloatingWindow {
     color: Theme.surfaceContainer
     visible: false
 
+    onClosed: hide()
+
     function resetForm() {
         nameInput.text = "";
         appIdInput.text = "";

quickshell/Modals/WorkspaceRenameModal.qml

@@ -18,6 +18,8 @@ FloatingWindow {
     color: Theme.surfaceContainer
     visible: false
 
+    onClosed: hide()
+
     function show(name) {
         nameInput.text = name;
         visible = true;

quickshell/Modules/DankBar/CenterSection.qml

@@ -48,7 +48,7 @@ Item {
 
         for (var i = 0; i < centerRepeater.count; i++) {
             const loader = centerRepeater.itemAt(i);
-            if (loader && loader.active && loader.item) {
+            if (loader && loader.active && loader.item && loader.item.visible) {
                 centerWidgets.push(loader.item);
                 totalWidgets++;
                 totalSize += isVertical ? loader.item.height : loader.item.width;
@@ -105,14 +105,14 @@ Item {
             if (!wrapper)
                 continue;
 
-            if (isOddConfigured && i === configuredMiddlePos && wrapper.active && wrapper.item)
+            if (isOddConfigured && i === configuredMiddlePos && wrapper.active && wrapper.item && wrapper.item.visible)
                 configuredMiddleWidget = wrapper.item;
-            if (!isOddConfigured && i === configuredLeftPos && wrapper.active && wrapper.item)
+            if (!isOddConfigured && i === configuredLeftPos && wrapper.active && wrapper.item && wrapper.item.visible)
                 configuredLeftWidget = wrapper.item;
-            if (!isOddConfigured && i === configuredRightPos && wrapper.active && wrapper.item)
+            if (!isOddConfigured && i === configuredRightPos && wrapper.active && wrapper.item && wrapper.item.visible)
                 configuredRightWidget = wrapper.item;
 
-            if (wrapper.active && wrapper.item) {
+            if (wrapper.active && wrapper.item && wrapper.item.visible) {
                 centerWidgets.push(wrapper.item);
                 totalWidgets++;
                 totalSize += isVertical ? wrapper.item.height : wrapper.item.width;
@@ -372,6 +372,7 @@ Item {
                 onContentItemReady: contentItem => {
                     contentItem.widthChanged.connect(() => layoutTimer.restart());
                     contentItem.heightChanged.connect(() => layoutTimer.restart());
+                    contentItem.visibleChanged.connect(() => layoutTimer.restart());
                     layoutTimer.restart();
                 }
 

quickshell/Modules/DankBar/LeftSection.qml

@@ -45,6 +45,7 @@ Item {
                 Item {
                     readonly property real rowSpacing: parent.widgetSpacing
                     property var itemData: modelData
+                    visible: widgetLoader.active && widgetLoader.widgetEnabled
                     width: widgetLoader.item ? widgetLoader.item.width : 0
                     height: widgetLoader.item ? widgetLoader.item.height : 0
                     WidgetHost {
@@ -92,6 +93,7 @@ Item {
                     width: parent.width
                     readonly property real columnSpacing: parent.widgetSpacing
                     property var itemData: modelData
+                    visible: widgetLoader.active && widgetLoader.widgetEnabled
                     height: widgetLoader.item ? widgetLoader.item.height : 0
                     WidgetHost {
                         id: widgetLoader

quickshell/Modules/DankBar/RightSection.qml

@@ -47,6 +47,7 @@ Item {
                 Item {
                     readonly property real rowSpacing: parent.widgetSpacing
                     property var itemData: modelData
+                    visible: widgetLoader.active && widgetLoader.widgetEnabled
                     width: widgetLoader.item ? widgetLoader.item.width : 0
                     height: widgetLoader.item ? widgetLoader.item.height : 0
                     WidgetHost {
@@ -94,6 +95,7 @@ Item {
                     width: parent.width
                     readonly property real columnSpacing: parent.widgetSpacing
                     property var itemData: modelData
+                    visible: widgetLoader.active && widgetLoader.widgetEnabled
                     height: widgetLoader.item ? widgetLoader.item.height : 0
                     WidgetHost {
                         id: widgetLoader

quickshell/Modules/DankBar/WidgetHost.qml

@@ -26,6 +26,7 @@ Loader {
     property bool isTopBarEdge: false
     property bool isBottomBarEdge: false
     property string _registeredScreenName: ""
+    property var _registeredItem: null
 
     asynchronous: false
 
@@ -227,15 +228,17 @@ Loader {
             return;
 
         _registeredScreenName = parentScreen.name;
-        BarWidgetService.registerWidget(widgetId, _registeredScreenName, item);
+        _registeredItem = item;
+        BarWidgetService.registerWidget(widgetId, _registeredScreenName, _registeredItem);
     }
 
     function unregisterWidget() {
         if (!widgetId || !_registeredScreenName)
             return;
 
-        BarWidgetService.unregisterWidget(widgetId, _registeredScreenName);
+        BarWidgetService.unregisterWidget(widgetId, _registeredScreenName, _registeredItem);
         _registeredScreenName = "";
+        _registeredItem = null;
     }
 
     function getWidgetComponent(widgetId, components) {

quickshell/Modules/Settings/DesktopWidgetBrowser.qml

@@ -110,6 +110,8 @@ FloatingWindow {
     color: Theme.surfaceContainer
     visible: false
 
+    onClosed: hide()
+
     onVisibleChanged: {
         if (visible) {
             updateFilteredWidgets();

quickshell/Modules/Settings/PluginBrowser.qml

@@ -482,6 +482,8 @@ FloatingWindow {
     color: Theme.surfaceContainer
     visible: false
 
+    onClosed: hide()
+
     onVisibleChanged: {
         if (visible) {
             pendingInstallHandled = false;

quickshell/Modules/Settings/WidgetSelectionPopup.qml

@@ -115,6 +115,8 @@ FloatingWindow {
     color: blurActive ? Theme.withAlpha(Theme.surfaceContainer, 0) : Theme.surfaceContainer
     visible: false
 
+    onClosed: hide()
+
     onVisibleChanged: {
         if (visible) {
             Qt.callLater(() => {

quickshell/Modules/Settings/Widgets/AppBrowserPopup.qml

@@ -26,6 +26,8 @@ FloatingWindow {
     color: "transparent"
     visible: false
 
+    onClosed: hide()
+
     WindowBlur {
         targetWindow: root
         blurX: 0

quickshell/Services/BarWidgetService.qml

@@ -27,13 +27,15 @@ Singleton {
         widgetRegistered(widgetId, screenName);
     }
 
-    function unregisterWidget(widgetId, screenName) {
+    function unregisterWidget(widgetId, screenName, widgetRef) {
         if (!widgetId || !screenName)
             return;
         if (typeof widgetRegistry !== "object" || widgetRegistry === null)
             return;
         if (!widgetRegistry[widgetId])
             return;
+        if (widgetRef && widgetRegistry[widgetId][screenName] !== widgetRef)
+            return;
 
         const nextRegistry = Object.assign({}, widgetRegistry);
         const screenMap = (typeof nextRegistry[widgetId] === "object" && nextRegistry[widgetId] !== null) ? Object.assign({}, nextRegistry[widgetId]) : {};