labwc patch (#1391 )

i18n: more RTL fixes across settings
popout: fix cross-monitor handling of widgets
2026-01-24 21:42:51 -05:00 · 2026-01-16 09:50:01 -05:00 · 2026-01-16 09:45:15 -05:00 · 2026-01-16 09:45:15 -05:00 · 2026-01-16 09:45:15 -05:00 · 2026-01-16 09:45:15 -05:00
12 changed files with 126 additions and 379 deletions
--- a/core/cmd/dms/commands_doctor.go
+++ b/core/cmd/dms/commands_doctor.go
@@ -87,6 +87,8 @@ var (
 	swayVersionRegex       = regexp.MustCompile(`sway version (\d+\.\d+)`)
 	riverVersionRegex      = regexp.MustCompile(`river (\d+\.\d+)`)
 	wayfireVersionRegex    = regexp.MustCompile(`wayfire (\d+\.\d+)`)
+	labwcVersionRegex      = regexp.MustCompile(`labwc (\d+\.\d+\.\d+)`)
+	mangowcVersionRegex    = regexp.MustCompile(`mango (\d+\.\d+\.\d+)`)
 )

 var doctorCmd = &cobra.Command{
@@ -448,11 +450,13 @@ func checkWindowManagers() []checkResult {
 		versionRegex                 *regexp.Regexp
 		commands                     []string
 	}{
-		{"Hyprland", "hyprctl", "version", hyprlandVersionRegex, []string{"hyprland", "Hyprland"}},
+		{"Hyprland", "Hyprland", "--version", hyprlandVersionRegex, []string{"hyprland", "Hyprland"}},
 		{"niri", "niri", "--version", niriVersionRegex, []string{"niri"}},
 		{"Sway", "sway", "--version", swayVersionRegex, []string{"sway"}},
 		{"River", "river", "-version", riverVersionRegex, []string{"river"}},
 		{"Wayfire", "wayfire", "--version", wayfireVersionRegex, []string{"wayfire"}},
+		{"labwc", "labwc", "--version", labwcVersionRegex, []string{"labwc"}},
+		{"mangowc", "mango", "-v", mangowcVersionRegex, []string{"mango"}},
 	}

 	var results []checkResult
@@ -498,8 +502,8 @@ func checkWindowManagers() []checkResult {
 }

 func getVersionFromCommand(cmd, arg string, regex *regexp.Regexp) string {
-	output, err := exec.Command(cmd, arg).Output()
-	if err != nil {
+	output, err := exec.Command(cmd, arg).CombinedOutput()
+	if err != nil && len(output) == 0 {
 		return "installed"
 	}

--- a/distro/nix/greeter.nix
+++ b/distro/nix/greeter.nix
@@ -11,12 +11,18 @@ let

  inherit (config.services.greetd.settings.default_session) user;

+  compositorPackage =
+    let
+      configured = lib.attrByPath [ "programs" cfg.compositor.name "package" ] null config;
+    in
+    if configured != null then configured else builtins.getAttr cfg.compositor.name pkgs;
+
  cacheDir = "/var/lib/dms-greeter";
  greeterScript = pkgs.writeShellScriptBin "dms-greeter" ''
    export PATH=$PATH:${
      lib.makeBinPath [
        cfg.quickshell.package
-        config.programs.${cfg.compositor.name}.package
+        compositorPackage
      ]
    }
    ${
@@ -64,6 +70,7 @@ in
        "niri"
        "hyprland"
        "sway"
+        "labwc"
      ];
      description = "Compositor to run greeter in";
    };
--- a/quickshell/Common/PopoutManager.qml
+++ b/quickshell/Common/PopoutManager.qml
@@ -82,15 +82,19 @@ Singleton {
            popoutOpening();
        }

-        let justClosedSamePopout = false;
+        let movedFromOtherScreen = false;
        for (const otherScreenName in currentPopoutsByScreen) {
            if (otherScreenName === screenName)
                continue;
            const otherPopout = currentPopoutsByScreen[otherScreenName];
            if (!otherPopout)
                continue;
+
            if (otherPopout === popout) {
-                justClosedSamePopout = true;
+                movedFromOtherScreen = true;
+                currentPopoutsByScreen[otherScreenName] = null;
+                currentPopoutTriggers[otherScreenName] = null;
+                continue;
            }

            if (otherPopout.dashVisible !== undefined) {
@@ -112,7 +116,7 @@ Singleton {
            }
        }

-        if (currentPopout === popout && popout.shouldBeVisible) {
+        if (currentPopout === popout && popout.shouldBeVisible && !movedFromOtherScreen) {
            if (triggerId !== undefined && currentPopoutTriggers[screenName] === triggerId) {
                if (popout.dashVisible !== undefined) {
                    popout.dashVisible = false;
@@ -139,6 +143,7 @@ Singleton {
                popout.currentTabIndex = tabIndex;
            }
            currentPopoutTriggers[screenName] = triggerId;
+            return;
        }

        currentPopoutTriggers[screenName] = triggerId;
@@ -153,16 +158,8 @@ Singleton {
            ModalManager.closeAllModalsExcept(null);
        }

-        if (justClosedSamePopout) {
-            Qt.callLater(() => {
-                if (popout.dashVisible !== undefined) {
-                    popout.dashVisible = true;
-                } else if (popout.notificationHistoryVisible !== undefined) {
-                    popout.notificationHistoryVisible = true;
-                } else {
-                    popout.open();
-                }
-            });
+        if (movedFromOtherScreen) {
+            popout.open();
        } else {
            if (popout.dashVisible !== undefined) {
                popout.dashVisible = true;
--- a/quickshell/Modules/DankBar/Widgets/ControlCenterButton.qml
+++ b/quickshell/Modules/DankBar/Widgets/ControlCenterButton.qml
@@ -244,13 +244,13 @@ BasePill {
            Column {
                id: controlColumn
                visible: root.isVerticalOrientation
-                anchors.centerIn: parent
+                width: root.vIconSize
+                anchors.horizontalCenter: parent.horizontalCenter
                spacing: Theme.spacingXS

                Item {
                    width: root.vIconSize
                    height: root.vIconSize
-                    anchors.horizontalCenter: parent.horizontalCenter
                    visible: root.showScreenSharingIcon && NiriService.hasCasts

                    DankIcon {
@@ -264,7 +264,6 @@ BasePill {
                Item {
                    width: root.vIconSize
                    height: root.vIconSize
-                    anchors.horizontalCenter: parent.horizontalCenter
                    visible: root.showNetworkIcon && NetworkService.networkAvailable

                    DankIcon {
@@ -278,7 +277,6 @@ BasePill {
                Item {
                    width: root.vIconSize
                    height: root.vIconSize
-                    anchors.horizontalCenter: parent.horizontalCenter
                    visible: root.showVpnIcon && NetworkService.vpnAvailable && NetworkService.vpnConnected

                    DankIcon {
@@ -292,7 +290,6 @@ BasePill {
                Item {
                    width: root.vIconSize
                    height: root.vIconSize
-                    anchors.horizontalCenter: parent.horizontalCenter
                    visible: root.showBluetoothIcon && BluetoothService.available && BluetoothService.enabled

                    DankIcon {
@@ -306,7 +303,6 @@ BasePill {
                Item {
                    width: root.vIconSize
                    height: root.vIconSize + (root.showAudioPercent ? audioPercentV.implicitHeight + 2 : 0)
-                    anchors.horizontalCenter: parent.horizontalCenter
                    visible: root.showAudioIcon

                    DankIcon {
@@ -345,7 +341,6 @@ BasePill {
                Item {
                    width: root.vIconSize
                    height: root.vIconSize + (root.showMicPercent ? micPercentV.implicitHeight + 2 : 0)
-                    anchors.horizontalCenter: parent.horizontalCenter
                    visible: root.showMicIcon

                    DankIcon {
@@ -384,7 +379,6 @@ BasePill {
                Item {
                    width: root.vIconSize
                    height: root.vIconSize + (root.showBrightnessPercent ? brightnessPercentV.implicitHeight + 2 : 0)
-                    anchors.horizontalCenter: parent.horizontalCenter
                    visible: root.showBrightnessIcon && DisplayService.brightnessAvailable && root.hasPinnedBrightnessDevice()

                    DankIcon {
@@ -420,7 +414,6 @@ BasePill {
                Item {
                    width: root.vIconSize
                    height: root.vIconSize
-                    anchors.horizontalCenter: parent.horizontalCenter
                    visible: root.showBatteryIcon && BatteryService.batteryAvailable

                    DankIcon {
@@ -434,7 +427,6 @@ BasePill {
                Item {
                    width: root.vIconSize
                    height: root.vIconSize
-                    anchors.horizontalCenter: parent.horizontalCenter
                    visible: root.showPrinterIcon && CupsService.cupsAvailable && root.hasPrintJobs()

                    DankIcon {
@@ -448,7 +440,6 @@ BasePill {
                Item {
                    width: root.vIconSize
                    height: root.vIconSize
-                    anchors.horizontalCenter: parent.horizontalCenter
                    visible: root.hasNoVisibleIcons()

                    DankIcon {
--- a/quickshell/Modules/Greetd/assets/dms-greeter
+++ b/quickshell/Modules/Greetd/assets/dms-greeter
@@ -2,8 +2,6 @@

 set -e

-export WLR_DRM_DEVICES=/dev/dri/card1
-
 COMPOSITOR=""
 COMPOSITOR_CONFIG=""
 DMS_PATH="dms-greeter"
@@ -16,7 +14,7 @@ dms-greeter - DankMaterialShell greeter launcher
 Usage: dms-greeter --command COMPOSITOR [OPTIONS]

 Required:
-    --command COMPOSITOR    Compositor to use (niri, hyprland, sway, scroll or mangowc)
+    --command COMPOSITOR    Compositor to use (niri, hyprland, sway, scroll, mangowc, or labwc)

 Options:
    -C, --config PATH       Custom compositor config file
@@ -33,6 +31,7 @@ Examples:
    dms-greeter --command scroll -p /home/user/.config/quickshell/custom-dms
    dms-greeter --command niri --cache-dir /tmp/dmsgreeter
    dms-greeter --command mangowc
+    dms-greeter --command labwc
 EOF
 }

@@ -231,6 +230,15 @@ SCROLL_EOF
        exec scroll -c "$COMPOSITOR_CONFIG"
        ;;

+
+    labwc)
+        if [[ -n "$COMPOSITOR_CONFIG" ]]; then
+            exec labwc --config "$COMPOSITOR_CONFIG" --session "$QS_CMD"
+        else
+            exec labwc --session "$QS_CMD"
+        fi
+        ;;
+
    mangowc)
        if [[ -n "$COMPOSITOR_CONFIG" ]]; then
            exec mango -c "$COMPOSITOR_CONFIG" -s "$QS_CMD && mmsg -d quit"
@@ -241,7 +249,7 @@ SCROLL_EOF

    *)
        echo "Error: Unsupported compositor: $COMPOSITOR" >&2
-        echo "Supported compositors: niri, hyprland, sway, mangowc" >&2
+        echo "Supported compositors: niri, hyprland, sway, scroll, mangowc, labwc" >&2
        exit 1
        ;;
 esac
--- a/quickshell/Modules/Settings/DockTab.qml
+++ b/quickshell/Modules/Settings/DockTab.qml
@@ -29,6 +29,9 @@ Item {
                SettingsButtonGroupRow {
                    text: I18n.tr("Position")
                    model: ["Top", "Bottom", "Left", "Right"]
+                    buttonPadding: Theme.spacingS
+                    minButtonWidth: 44
+                    textSize: Theme.fontSizeSmall
                    currentIndex: {
                        switch (SettingsData.dockPosition) {
                        case SettingsData.Position.Top:
@@ -129,6 +132,9 @@ Item {
                    tags: ["dock", "indicator", "style", "circle", "line"]
                    text: I18n.tr("Indicator Style")
                    model: ["Circle", "Line"]
+                    buttonPadding: Theme.spacingS
+                    minButtonWidth: 44
+                    textSize: Theme.fontSizeSmall
                    currentIndex: SettingsData.dockIndicatorStyle === "circle" ? 0 : 1
                    onSelectionChanged: (index, selected) => {
                        if (selected) {
@@ -225,6 +231,9 @@ Item {
                    description: I18n.tr("Choose the border accent color")
                    visible: SettingsData.dockBorderEnabled
                    model: ["Surface", "Secondary", "Primary"]
+                    buttonPadding: Theme.spacingS
+                    minButtonWidth: 44
+                    textSize: Theme.fontSizeSmall
                    currentIndex: {
                        switch (SettingsData.dockBorderColor) {
                        case "surfaceText":
--- a/quickshell/Modules/Settings/Widgets/SettingsToggleCard.qml
+++ b/quickshell/Modules/Settings/Widgets/SettingsToggleCard.qml
@@ -51,6 +51,7 @@ StyledRect {

                Row {
                    spacing: Theme.spacingM
+                    width: parent.width

                    DankIcon {
                        id: headerIcon
@@ -69,6 +70,8 @@ StyledRect {
                        color: Theme.surfaceText
                        anchors.verticalCenter: parent.verticalCenter
                        visible: root.title !== ""
+                        width: parent.width - (headerIcon.visible ? headerIcon.width + parent.spacing : 0)
+                        horizontalAlignment: Text.AlignLeft
                    }
                }

--- a/quickshell/Modules/Settings/WidgetsTab.qml
+++ b/quickshell/Modules/Settings/WidgetsTab.qml
@@ -402,6 +402,24 @@ Item {
        setWidgetsForSection(sectionId, widgets);
    }

+    function cloneWidgetData(widget) {
+        if (typeof widget === "string")
+            return {
+                "id": widget,
+                "enabled": true
+            };
+        var result = {
+            "id": widget.id,
+            "enabled": widget.enabled
+        };
+        var keys = ["size", "selectedGpuIndex", "pciId", "mountPath", "minimumWidth", "showSwap", "mediaSize", "clockCompactMode", "focusedWindowCompactMode", "runningAppsCompactMode", "keyboardLayoutNameCompactMode", "showNetworkIcon", "showBluetoothIcon", "showAudioIcon", "showAudioPercent", "showVpnIcon", "showBrightnessIcon", "showBrightnessPercent", "showMicIcon", "showMicPercent", "showBatteryIcon", "showPrinterIcon", "showScreenSharingIcon"];
+        for (var i = 0; i < keys.length; i++) {
+            if (widget[keys[i]] !== undefined)
+                result[keys[i]] = widget[keys[i]];
+        }
+        return result;
+    }
+
    function handleItemEnabledChanged(sectionId, itemId, enabled) {
        var widgets = getWidgetsForSection(sectionId).slice();
        for (var i = 0; i < widgets.length; i++) {
@@ -409,43 +427,8 @@ Item {
            var widgetId = typeof widget === "string" ? widget : widget.id;
            if (widgetId !== itemId)
                continue;
-
-            if (typeof widget === "string") {
-                widgets[i] = {
-                    "id": widget,
-                    "enabled": enabled
-                };
-                break;
-            }
-
-            var newWidget = {
-                "id": widget.id,
-                "enabled": enabled
-            };
-            if (widget.size !== undefined)
-                newWidget.size = widget.size;
-            if (widget.selectedGpuIndex !== undefined)
-                newWidget.selectedGpuIndex = widget.selectedGpuIndex;
-            else if (widget.id === "gpuTemp")
-                newWidget.selectedGpuIndex = 0;
-            if (widget.pciId !== undefined)
-                newWidget.pciId = widget.pciId;
-            else if (widget.id === "gpuTemp")
-                newWidget.pciId = "";
-            if (widget.id === "controlCenterButton") {
-                newWidget.showNetworkIcon = widget.showNetworkIcon ?? SettingsData.controlCenterShowNetworkIcon;
-                newWidget.showBluetoothIcon = widget.showBluetoothIcon ?? SettingsData.controlCenterShowBluetoothIcon;
-                newWidget.showAudioIcon = widget.showAudioIcon ?? SettingsData.controlCenterShowAudioIcon;
-                newWidget.showAudioPercent = widget.showAudioPercent ?? SettingsData.controlCenterShowAudioPercent;
-                newWidget.showVpnIcon = widget.showVpnIcon ?? SettingsData.controlCenterShowVpnIcon;
-                newWidget.showBrightnessIcon = widget.showBrightnessIcon ?? SettingsData.controlCenterShowBrightnessIcon;
-                newWidget.showBrightnessPercent = widget.showBrightnessPercent ?? SettingsData.controlCenterShowBrightnessPercent;
-                newWidget.showMicIcon = widget.showMicIcon ?? SettingsData.controlCenterShowMicIcon;
-                newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
-                newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
-                newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
-                newWidget.showScreenSharingIcon = widget.showScreenSharingIcon ?? SettingsData.controlCenterShowScreenSharingIcon;
-            }
+            var newWidget = cloneWidgetData(widget);
+            newWidget.enabled = enabled;
            widgets[i] = newWidget;
            break;
        }
@@ -458,130 +441,36 @@ Item {

    function handleSpacerSizeChanged(sectionId, widgetIndex, newSize) {
        var widgets = getWidgetsForSection(sectionId).slice();
-        if (widgetIndex < 0 || widgetIndex >= widgets.length) {
-            setWidgetsForSection(sectionId, widgets);
+        if (widgetIndex < 0 || widgetIndex >= widgets.length)
            return;
-        }
-
        var widget = widgets[widgetIndex];
        var widgetId = typeof widget === "string" ? widget : widget.id;
-        if (widgetId !== "spacer") {
-            setWidgetsForSection(sectionId, widgets);
+        if (widgetId !== "spacer")
            return;
-        }
-
-        if (typeof widget === "string") {
-            widgets[widgetIndex] = {
-                "id": widget,
-                "enabled": true,
-                "size": newSize
-            };
-            setWidgetsForSection(sectionId, widgets);
-            return;
-        }
-
-        var newWidget = {
-            "id": widget.id,
-            "enabled": widget.enabled,
-            "size": newSize
-        };
-        if (widget.selectedGpuIndex !== undefined)
-            newWidget.selectedGpuIndex = widget.selectedGpuIndex;
-        if (widget.pciId !== undefined)
-            newWidget.pciId = widget.pciId;
-        if (widget.id === "controlCenterButton") {
-            newWidget.showNetworkIcon = widget.showNetworkIcon ?? SettingsData.controlCenterShowNetworkIcon;
-            newWidget.showBluetoothIcon = widget.showBluetoothIcon ?? SettingsData.controlCenterShowBluetoothIcon;
-            newWidget.showAudioIcon = widget.showAudioIcon ?? SettingsData.controlCenterShowAudioIcon;
-            newWidget.showAudioPercent = widget.showAudioPercent ?? SettingsData.controlCenterShowAudioPercent;
-            newWidget.showVpnIcon = widget.showVpnIcon ?? SettingsData.controlCenterShowVpnIcon;
-            newWidget.showBrightnessIcon = widget.showBrightnessIcon ?? SettingsData.controlCenterShowBrightnessIcon;
-            newWidget.showBrightnessPercent = widget.showBrightnessPercent ?? SettingsData.controlCenterShowBrightnessPercent;
-            newWidget.showMicIcon = widget.showMicIcon ?? SettingsData.controlCenterShowMicIcon;
-            newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
-            newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
-            newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
-            newWidget.showScreenSharingIcon = widget.showScreenSharingIcon ?? SettingsData.controlCenterShowScreenSharingIcon;
-        }
+        var newWidget = cloneWidgetData(widget);
+        newWidget.size = newSize;
        widgets[widgetIndex] = newWidget;
        setWidgetsForSection(sectionId, widgets);
    }

    function handleGpuSelectionChanged(sectionId, widgetIndex, selectedGpuIndex) {
        var widgets = getWidgetsForSection(sectionId).slice();
-        if (widgetIndex < 0 || widgetIndex >= widgets.length) {
-            setWidgetsForSection(sectionId, widgets);
+        if (widgetIndex < 0 || widgetIndex >= widgets.length)
            return;
-        }
-
        var pciId = DgopService.availableGpus && DgopService.availableGpus.length > selectedGpuIndex ? DgopService.availableGpus[selectedGpuIndex].pciId : "";
-        var widget = widgets[widgetIndex];
-        if (typeof widget === "string") {
-            widgets[widgetIndex] = {
-                "id": widget,
-                "enabled": true,
-                "selectedGpuIndex": selectedGpuIndex,
-                "pciId": pciId
-            };
-            setWidgetsForSection(sectionId, widgets);
-            return;
-        }
-
-        var newWidget = {
-            "id": widget.id,
-            "enabled": widget.enabled,
-            "selectedGpuIndex": selectedGpuIndex,
-            "pciId": pciId
-        };
-        if (widget.size !== undefined)
-            newWidget.size = widget.size;
+        var newWidget = cloneWidgetData(widgets[widgetIndex]);
+        newWidget.selectedGpuIndex = selectedGpuIndex;
+        newWidget.pciId = pciId;
        widgets[widgetIndex] = newWidget;
        setWidgetsForSection(sectionId, widgets);
    }

    function handleDiskMountSelectionChanged(sectionId, widgetIndex, mountPath) {
        var widgets = getWidgetsForSection(sectionId).slice();
-        if (widgetIndex < 0 || widgetIndex >= widgets.length) {
-            setWidgetsForSection(sectionId, widgets);
+        if (widgetIndex < 0 || widgetIndex >= widgets.length)
            return;
-        }
-
-        var widget = widgets[widgetIndex];
-        if (typeof widget === "string") {
-            widgets[widgetIndex] = {
-                "id": widget,
-                "enabled": true,
-                "mountPath": mountPath
-            };
-            setWidgetsForSection(sectionId, widgets);
-            return;
-        }
-
-        var newWidget = {
-            "id": widget.id,
-            "enabled": widget.enabled,
-            "mountPath": mountPath
-        };
-        if (widget.size !== undefined)
-            newWidget.size = widget.size;
-        if (widget.selectedGpuIndex !== undefined)
-            newWidget.selectedGpuIndex = widget.selectedGpuIndex;
-        if (widget.pciId !== undefined)
-            newWidget.pciId = widget.pciId;
-        if (widget.id === "controlCenterButton") {
-            newWidget.showNetworkIcon = widget.showNetworkIcon ?? SettingsData.controlCenterShowNetworkIcon;
-            newWidget.showBluetoothIcon = widget.showBluetoothIcon ?? SettingsData.controlCenterShowBluetoothIcon;
-            newWidget.showAudioIcon = widget.showAudioIcon ?? SettingsData.controlCenterShowAudioIcon;
-            newWidget.showAudioPercent = widget.showAudioPercent ?? SettingsData.controlCenterShowAudioPercent;
-            newWidget.showVpnIcon = widget.showVpnIcon ?? SettingsData.controlCenterShowVpnIcon;
-            newWidget.showBrightnessIcon = widget.showBrightnessIcon ?? SettingsData.controlCenterShowBrightnessIcon;
-            newWidget.showBrightnessPercent = widget.showBrightnessPercent ?? SettingsData.controlCenterShowBrightnessPercent;
-            newWidget.showMicIcon = widget.showMicIcon ?? SettingsData.controlCenterShowMicIcon;
-            newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
-            newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
-            newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
-            newWidget.showScreenSharingIcon = widget.showScreenSharingIcon ?? SettingsData.controlCenterShowScreenSharingIcon;
-        }
+        var newWidget = cloneWidgetData(widgets[widgetIndex]);
+        newWidget.mountPath = mountPath;
        widgets[widgetIndex] = newWidget;
        setWidgetsForSection(sectionId, widgets);
    }
@@ -590,33 +479,8 @@ Item {
        var widgets = getWidgetsForSection(sectionId).slice();
        if (widgetIndex < 0 || widgetIndex >= widgets.length)
            return;
-
-        var widget = widgets[widgetIndex];
-        if (typeof widget === "string") {
-            widget = {
-                "id": widget,
-                "enabled": true
-            };
-        }
-
-        var newWidget = {
-            "id": widget.id,
-            "enabled": widget.enabled !== undefined ? widget.enabled : true,
-            "showNetworkIcon": widget.showNetworkIcon ?? SettingsData.controlCenterShowNetworkIcon,
-            "showBluetoothIcon": widget.showBluetoothIcon ?? SettingsData.controlCenterShowBluetoothIcon,
-            "showAudioIcon": widget.showAudioIcon ?? SettingsData.controlCenterShowAudioIcon,
-            "showAudioPercent": widget.showAudioPercent ?? SettingsData.controlCenterShowAudioPercent,
-            "showVpnIcon": widget.showVpnIcon ?? SettingsData.controlCenterShowVpnIcon,
-            "showBrightnessIcon": widget.showBrightnessIcon ?? SettingsData.controlCenterShowBrightnessIcon,
-            "showBrightnessPercent": widget.showBrightnessPercent ?? SettingsData.controlCenterShowBrightnessPercent,
-            "showMicIcon": widget.showMicIcon ?? SettingsData.controlCenterShowMicIcon,
-            "showMicPercent": widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent,
-            "showBatteryIcon": widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon,
-            "showPrinterIcon": widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon,
-            "showScreenSharingIcon": widget.showScreenSharingIcon ?? SettingsData.controlCenterShowScreenSharingIcon
-        };
+        var newWidget = cloneWidgetData(widgets[widgetIndex]);
        newWidget[settingName] = value;
-
        widgets[widgetIndex] = newWidget;
        setWidgetsForSection(sectionId, widgets);
    }
@@ -641,47 +505,8 @@ Item {
            setWidgetsForSection(sectionId, widgets);
            return;
        }
-
-        var widget = widgets[widgetIndex];
-        if (typeof widget === "string") {
-            widgets[widgetIndex] = {
-                "id": widget,
-                "enabled": true,
-                "minimumWidth": enabled
-            };
-            setWidgetsForSection(sectionId, widgets);
-            return;
-        }
-
-        var newWidget = {
-            "id": widget.id,
-            "enabled": widget.enabled,
-            "minimumWidth": enabled
-        };
-        if (widget.size !== undefined)
-            newWidget.size = widget.size;
-        if (widget.selectedGpuIndex !== undefined)
-            newWidget.selectedGpuIndex = widget.selectedGpuIndex;
-        if (widget.pciId !== undefined)
-            newWidget.pciId = widget.pciId;
-        if (widget.mountPath !== undefined)
-            newWidget.mountPath = widget.mountPath;
-        if (widget.showSwap !== undefined)
-            newWidget.showSwap = widget.showSwap;
-        if (widget.id === "controlCenterButton") {
-            newWidget.showNetworkIcon = widget.showNetworkIcon ?? SettingsData.controlCenterShowNetworkIcon;
-            newWidget.showBluetoothIcon = widget.showBluetoothIcon ?? SettingsData.controlCenterShowBluetoothIcon;
-            newWidget.showAudioIcon = widget.showAudioIcon ?? SettingsData.controlCenterShowAudioIcon;
-            newWidget.showAudioPercent = widget.showAudioPercent ?? SettingsData.controlCenterShowAudioPercent;
-            newWidget.showVpnIcon = widget.showVpnIcon ?? SettingsData.controlCenterShowVpnIcon;
-            newWidget.showBrightnessIcon = widget.showBrightnessIcon ?? SettingsData.controlCenterShowBrightnessIcon;
-            newWidget.showBrightnessPercent = widget.showBrightnessPercent ?? SettingsData.controlCenterShowBrightnessPercent;
-            newWidget.showMicIcon = widget.showMicIcon ?? SettingsData.controlCenterShowMicIcon;
-            newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
-            newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
-            newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
-            newWidget.showScreenSharingIcon = widget.showScreenSharingIcon ?? SettingsData.controlCenterShowScreenSharingIcon;
-        }
+        var newWidget = cloneWidgetData(widgets[widgetIndex]);
+        newWidget.minimumWidth = enabled;
        widgets[widgetIndex] = newWidget;
        setWidgetsForSection(sectionId, widgets);
    }
@@ -692,143 +517,41 @@ Item {
            setWidgetsForSection(sectionId, widgets);
            return;
        }
-
-        var widget = widgets[widgetIndex];
-        if (typeof widget === "string") {
-            widgets[widgetIndex] = {
-                "id": widget,
-                "enabled": true,
-                "showSwap": enabled
-            };
-            setWidgetsForSection(sectionId, widgets);
-            return;
-        }
-
-        var newWidget = {
-            "id": widget.id,
-            "enabled": widget.enabled,
-            "showSwap": enabled
-        };
-        if (widget.size !== undefined)
-            newWidget.size = widget.size;
-        if (widget.selectedGpuIndex !== undefined)
-            newWidget.selectedGpuIndex = widget.selectedGpuIndex;
-        if (widget.pciId !== undefined)
-            newWidget.pciId = widget.pciId;
-        if (widget.mountPath !== undefined)
-            newWidget.mountPath = widget.mountPath;
-        if (widget.minimumWidth !== undefined)
-            newWidget.minimumWidth = widget.minimumWidth;
-        if (widget.mediaSize !== undefined)
-            newWidget.mediaSize = widget.mediaSize;
-        if (widget.clockCompactMode !== undefined)
-            newWidget.clockCompactMode = widget.clockCompactMode;
-        if (widget.focusedWindowCompactMode !== undefined)
-            newWidget.focusedWindowCompactMode = widget.focusedWindowCompactMode;
-        if (widget.runningAppsCompactMode !== undefined)
-            newWidget.runningAppsCompactMode = widget.runningAppsCompactMode;
-        if (widget.keyboardLayoutNameCompactMode !== undefined)
-            newWidget.keyboardLayoutNameCompactMode = widget.keyboardLayoutNameCompactMode;
-        if (widget.id === "controlCenterButton") {
-            newWidget.showNetworkIcon = widget.showNetworkIcon ?? SettingsData.controlCenterShowNetworkIcon;
-            newWidget.showBluetoothIcon = widget.showBluetoothIcon ?? SettingsData.controlCenterShowBluetoothIcon;
-            newWidget.showAudioIcon = widget.showAudioIcon ?? SettingsData.controlCenterShowAudioIcon;
-            newWidget.showAudioPercent = widget.showAudioPercent ?? SettingsData.controlCenterShowAudioPercent;
-            newWidget.showVpnIcon = widget.showVpnIcon ?? SettingsData.controlCenterShowVpnIcon;
-            newWidget.showBrightnessIcon = widget.showBrightnessIcon ?? SettingsData.controlCenterShowBrightnessIcon;
-            newWidget.showBrightnessPercent = widget.showBrightnessPercent ?? SettingsData.controlCenterShowBrightnessPercent;
-            newWidget.showMicIcon = widget.showMicIcon ?? SettingsData.controlCenterShowMicIcon;
-            newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
-            newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
-            newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
-            newWidget.showScreenSharingIcon = widget.showScreenSharingIcon ?? SettingsData.controlCenterShowScreenSharingIcon;
-        }
+        var newWidget = cloneWidgetData(widgets[widgetIndex]);
+        newWidget.showSwap = enabled;
        widgets[widgetIndex] = newWidget;
        setWidgetsForSection(sectionId, widgets);
    }

    function handleCompactModeChanged(sectionId, widgetId, value) {
        var widgets = getWidgetsForSection(sectionId).slice();
-
        for (var i = 0; i < widgets.length; i++) {
            var widget = widgets[i];
            var currentId = typeof widget === "string" ? widget : widget.id;
-
            if (currentId !== widgetId)
                continue;

-            if (typeof widget === "string") {
-                widgets[i] = {
-                    "id": widget,
-                    "enabled": true
-                };
-                widget = widgets[i];
-            } else {
-                var newWidget = {
-                    "id": widget.id,
-                    "enabled": widget.enabled
-                };
-                if (widget.size !== undefined)
-                    newWidget.size = widget.size;
-                if (widget.selectedGpuIndex !== undefined)
-                    newWidget.selectedGpuIndex = widget.selectedGpuIndex;
-                if (widget.pciId !== undefined)
-                    newWidget.pciId = widget.pciId;
-                if (widget.mountPath !== undefined)
-                    newWidget.mountPath = widget.mountPath;
-                if (widget.minimumWidth !== undefined)
-                    newWidget.minimumWidth = widget.minimumWidth;
-                if (widget.showSwap !== undefined)
-                    newWidget.showSwap = widget.showSwap;
-                if (widget.mediaSize !== undefined)
-                    newWidget.mediaSize = widget.mediaSize;
-                if (widget.clockCompactMode !== undefined)
-                    newWidget.clockCompactMode = widget.clockCompactMode;
-                if (widget.focusedWindowCompactMode !== undefined)
-                    newWidget.focusedWindowCompactMode = widget.focusedWindowCompactMode;
-                if (widget.runningAppsCompactMode !== undefined)
-                    newWidget.runningAppsCompactMode = widget.runningAppsCompactMode;
-                if (widget.keyboardLayoutNameCompactMode !== undefined)
-                    newWidget.keyboardLayoutNameCompactMode = widget.keyboardLayoutNameCompactMode;
-                if (widget.id === "controlCenterButton") {
-                    newWidget.showNetworkIcon = widget.showNetworkIcon ?? SettingsData.controlCenterShowNetworkIcon;
-                    newWidget.showBluetoothIcon = widget.showBluetoothIcon ?? SettingsData.controlCenterShowBluetoothIcon;
-                    newWidget.showAudioIcon = widget.showAudioIcon ?? SettingsData.controlCenterShowAudioIcon;
-                    newWidget.showAudioPercent = widget.showAudioPercent ?? SettingsData.controlCenterShowAudioPercent;
-                    newWidget.showVpnIcon = widget.showVpnIcon ?? SettingsData.controlCenterShowVpnIcon;
-                    newWidget.showBrightnessIcon = widget.showBrightnessIcon ?? SettingsData.controlCenterShowBrightnessIcon;
-                    newWidget.showBrightnessPercent = widget.showBrightnessPercent ?? SettingsData.controlCenterShowBrightnessPercent;
-                    newWidget.showMicIcon = widget.showMicIcon ?? SettingsData.controlCenterShowMicIcon;
-                    newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
-                    newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
-                    newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
-                    newWidget.showScreenSharingIcon = widget.showScreenSharingIcon ?? SettingsData.controlCenterShowScreenSharingIcon;
-                }
-                widgets[i] = newWidget;
-                widget = newWidget;
-            }
-
+            var newWidget = cloneWidgetData(widget);
            switch (widgetId) {
            case "music":
-                widget.mediaSize = value;
+                newWidget.mediaSize = value;
                break;
            case "clock":
-                widget.clockCompactMode = value;
+                newWidget.clockCompactMode = value;
                break;
            case "focusedWindow":
-                widget.focusedWindowCompactMode = value;
+                newWidget.focusedWindowCompactMode = value;
                break;
            case "runningApps":
-                widget.runningAppsCompactMode = value;
+                newWidget.runningAppsCompactMode = value;
                break;
            case "keyboard_layout_name":
-                widget.keyboardLayoutNameCompactMode = value;
+                newWidget.keyboardLayoutNameCompactMode = value;
                break;
            }
-
+            widgets[i] = newWidget;
            break;
        }
-
        setWidgetsForSection(sectionId, widgets);
    }

--- a/quickshell/Modules/Settings/WidgetsTabSection.qml
+++ b/quickshell/Modules/Settings/WidgetsTabSection.qml
@@ -31,6 +31,19 @@ Column {
    signal minimumWidthChanged(string sectionId, int widgetIndex, bool enabled)
    signal showSwapChanged(string sectionId, int widgetIndex, bool enabled)

+    function cloneWidgetData(widget) {
+        var result = {
+            "id": widget.id,
+            "enabled": widget.enabled
+        };
+        var keys = ["size", "selectedGpuIndex", "pciId", "mountPath", "minimumWidth", "showSwap", "mediaSize", "clockCompactMode", "focusedWindowCompactMode", "runningAppsCompactMode", "keyboardLayoutNameCompactMode", "showNetworkIcon", "showBluetoothIcon", "showAudioIcon", "showAudioPercent", "showVpnIcon", "showBrightnessIcon", "showBrightnessPercent", "showMicIcon", "showMicPercent", "showBatteryIcon", "showPrinterIcon", "showScreenSharingIcon"];
+        for (var i = 0; i < keys.length; i++) {
+            if (widget[keys[i]] !== undefined)
+                result[keys[i]] = widget[keys[i]];
+        }
+        return result;
+    }
+
    width: parent.width
    height: implicitHeight
    spacing: Theme.spacingM
@@ -727,13 +740,7 @@ Column {
                                    var newItems = root.items.slice();
                                    var draggedItem = newItems.splice(index, 1)[0];
                                    newItems.splice(newIndex, 0, draggedItem);
-                                    root.itemOrderChanged(newItems.map(item => {
-                                        return ({
-                                                "id": item.id,
-                                                "enabled": item.enabled,
-                                                "size": item.size
-                                            });
-                                    }));
+                                    root.itemOrderChanged(newItems.map(item => root.cloneWidgetData(item)));
                                }
                            }
                            delegateItem.x = 0;
--- a/quickshell/Modules/Settings/WorkspacesTab.qml
+++ b/quickshell/Modules/Settings/WorkspacesTab.qml
@@ -63,15 +63,15 @@ Item {
                    onToggled: checked => SettingsData.set("showWorkspaceApps", checked)
                }

-                Row {
-                    width: parent.width - Theme.spacingL
-                    spacing: Theme.spacingL
+                Item {
+                    width: parent.width
+                    height: maxAppsColumn.height
                    visible: SettingsData.showWorkspaceApps
                    opacity: visible ? 1 : 0
-                    anchors.left: parent.left
-                    anchors.leftMargin: Theme.spacingL

                    Column {
+                        id: maxAppsColumn
+                        x: Theme.spacingL
                        width: 120
                        spacing: Theme.spacingS

@@ -80,14 +80,15 @@ Item {
                            font.pixelSize: Theme.fontSizeSmall
                            color: Theme.surfaceText
                            font.weight: Font.Medium
+                            horizontalAlignment: Text.AlignLeft
                        }

                        DankTextField {
                            width: 100
                            height: 28
-                            placeholderText: "#ffffff"
+                            placeholderText: "3"
                            text: SettingsData.maxWorkspaceIcons
-                            maximumLength: 7
+                            maximumLength: 2
                            font.pixelSize: Theme.fontSizeSmall
                            topPadding: Theme.spacingXS
                            bottomPadding: Theme.spacingXS
--- a/quickshell/Services/PluginService.qml
+++ b/quickshell/Services/PluginService.qml
@@ -287,11 +287,14 @@ Singleton {
                return false;
            }

-            // MODIFICATION: Treat Launchers as persistent instances like Daemons
-            if (isDaemon || isLauncher) {
+            if (isDaemon) {
+                const newDaemons = Object.assign({}, pluginDaemonComponents);
+                newDaemons[pluginId] = comp;
+                pluginDaemonComponents = newDaemons;
+            } else if (isLauncher) {
                const instance = comp.createObject(root, {
                    "pluginId": pluginId,
-                    "pluginService": root // Inject PluginService
+                    "pluginService": root
                });
                if (!instance) {
                    console.error("PluginService: failed to instantiate plugin:", pluginId, comp.errorString());
@@ -302,15 +305,9 @@ Singleton {
                newInstances[pluginId] = instance;
                pluginInstances = newInstances;

-                if (isDaemon) {
-                    const newDaemons = Object.assign({}, pluginDaemonComponents);
-                    newDaemons[pluginId] = comp;
-                    pluginDaemonComponents = newDaemons;
-                } else {
-                    const newLaunchers = Object.assign({}, pluginLauncherComponents);
-                    newLaunchers[pluginId] = comp;
-                    pluginLauncherComponents = newLaunchers;
-                }
+                const newLaunchers = Object.assign({}, pluginLauncherComponents);
+                newLaunchers[pluginId] = comp;
+                pluginLauncherComponents = newLaunchers;
            } else if (isDesktop) {
                const newDesktop = Object.assign({}, pluginDesktopComponents);
                newDesktop[pluginId] = comp;
--- a/quickshell/Services/WeatherService.qml
+++ b/quickshell/Services/WeatherService.qml
@@ -754,7 +754,7 @@ Singleton {
                                "humidity": Math.round(hourly.relative_humidity_2m?.[i] || 0),
                                "wind": Math.round(hourly.wind_speed_10m?.[i] || 0),
                                "pressure": Math.round(hourly.surface_pressure?.[i] || 0),
-                                "precipitationProbability": Math.round(hourly.precipitation_probability_max?.[0] || 0),
+                                "precipitationProbability": Math.round(hourly.precipitation_probability?.[i] || 0),
                                "visibility": Math.round(hourly.visibility?.[i] || 0),
                                "isDay": isDay
                            });
Author	SHA1	Message	Date
Flux	d7b7086b21	labwc patch (#1391 )	2026-01-16 09:50:01 -05:00
bbedward	59be179821	i18n: more RTL fixes across settings	2026-01-16 09:45:15 -05:00
bbedward	1cf2f6b946	popout: fix cross-monitor handling of widgets fixes #1364	2026-01-16 09:45:15 -05:00
bbedward	a57a9c2121	doctor: add mango and labwc to compositors fixes #1394	2026-01-16 09:45:15 -05:00
bbedward	67568c3746	greeter: remove WLR_DRM_DEVICES setting fixes #1393	2026-01-16 09:45:15 -05:00
bbedward	afce792b80	dankbar: fix property preservation in widgets fixes #1392	2026-01-16 09:45:15 -05:00
bbedward	f5c7493dbb	weather: fix precipitationw weekly propability fixes #1395	2026-01-16 09:45:15 -05:00
bbedward	f9b9d98638	plugins: ensure daemon plugins not instantiated twice	2026-01-16 09:45:15 -05:00
bbedward	2a97e03fa6	cc: fixed width column, remove anchoring from individual icons on vbar maybe #1376	2026-01-16 09:45:15 -05:00