missing import

dankinstall: add ultramarine
hyprland: restore focus grab to tray menus
2026-01-28 15:32:50 -05:00 · 2025-11-19 19:14:47 -05:00 · 2025-11-19 18:53:41 -05:00 · 2025-11-19 17:24:14 -05:00 · 2025-11-19 17:16:51 -05:00 · 2025-11-19 14:36:08 -05:00
21 changed files with 136 additions and 26 deletions
--- a/core/internal/distros/fedora.go
+++ b/core/internal/distros/fedora.go
@@ -19,10 +19,12 @@ func init() {
 	Register("fedora-asahi-remix", "#0B57A4", FamilyFedora, func(config DistroConfig, logChan chan<- string) Distribution {
 		return NewFedoraDistribution(config, logChan)
 	})
-
 	Register("bluefin", "#0B57A4", FamilyFedora, func(config DistroConfig, logChan chan<- string) Distribution {
 		return NewFedoraDistribution(config, logChan)
 	})
+	Register("ultramarine", "#00078b", FamilyFedora, func(config DistroConfig, logChan chan<- string) Distribution {
+		return NewFedoraDistribution(config, logChan)
+	})
 }

 type FedoraDistribution struct {
@@ -506,6 +508,14 @@ func (f *FedoraDistribution) installDNFPackages(ctx context.Context, packages []
 	f.log(fmt.Sprintf("Installing DNF packages: %s", strings.Join(packages, ", ")))

 	args := []string{"dnf", "install", "-y"}
+
+	for _, pkg := range packages {
+		if pkg == "niri" || pkg == "niri-git" {
+			args = append(args, "--setopt=install_weak_deps=False")
+			break
+		}
+	}
+
 	args = append(args, packages...)

 	progressChan <- InstallProgressMsg{
--- a/quickshell/Modals/BluetoothPairingModal.qml
+++ b/quickshell/Modals/BluetoothPairingModal.qml
@@ -1,4 +1,6 @@
 import QtQuick
+import Quickshell
+import Quickshell.Hyprland
 import qs.Common
 import qs.Modals.Common
 import qs.Services
@@ -9,6 +11,11 @@ DankModal {

    layerNamespace: "dms:bluetooth-pairing"

+    HyprlandFocusGrab {
+        windows: [root]
+        active: CompositorService.isHyprland && root.shouldHaveFocus
+    }
+
    property string deviceName: ""
    property string deviceAddress: ""
    property string requestType: ""
--- a/quickshell/Modals/Clipboard/ClipboardHistoryModal.qml
+++ b/quickshell/Modals/Clipboard/ClipboardHistoryModal.qml
@@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound
 import QtQuick
 import QtQuick.Controls
 import Quickshell
+import Quickshell.Hyprland
 import Quickshell.Io
 import qs.Common
 import qs.Modals.Common
@@ -14,6 +15,11 @@ DankModal {

    layerNamespace: "dms:clipboard"

+    HyprlandFocusGrab {
+        windows: [clipboardHistoryModal]
+        active: CompositorService.isHyprland && clipboardHistoryModal.shouldHaveFocus
+    }
+
    property int totalCount: 0
    property var clipboardEntries: []
    property string searchText: ""
--- a/quickshell/Modals/Common/DankModal.qml
+++ b/quickshell/Modals/Common/DankModal.qml
@@ -95,11 +95,6 @@ PanelWindow {
        return WlrKeyboardFocus.Exclusive
    }

-    HyprlandFocusGrab {
-        windows: [root]
-        active: CompositorService.isHyprland && shouldHaveFocus
-    }
-
    onVisibleChanged: {
        if (root.visible) {
            opened()
@@ -245,7 +240,7 @@ PanelWindow {
            clip: false
            layer.enabled: true
            layer.smooth: false
-            layer.textureSize: Qt.size(width * root.dpr, height * root.dpr)
+            layer.textureSize: Qt.size(Math.round(width * root.dpr), Math.round(height * root.dpr))
            opacity: root.shouldBeVisible ? 1 : 0
            scale: modalContainer.scaleValue
            x: Theme.snap(modalContainer.animX + (parent.width - width) * (1 - modalContainer.scaleValue) * 0.5, root.dpr)
--- a/quickshell/Modals/DankColorPickerModal.qml
+++ b/quickshell/Modals/DankColorPickerModal.qml
@@ -1,6 +1,7 @@
 import QtQuick
 import QtQuick.Controls
 import Quickshell
+import Quickshell.Hyprland
 import Quickshell.Io
 import qs.Common
 import qs.Modals.Common
@@ -12,6 +13,11 @@ DankModal {

    layerNamespace: "dms:color-picker"

+    HyprlandFocusGrab {
+        windows: [root]
+        active: CompositorService.isHyprland && root.shouldHaveFocus
+    }
+
    property string pickerTitle: "Choose Color"
    property color selectedColor: SessionData.recentColors.length > 0 ? SessionData.recentColors[0] : Theme.primary
    property var onColorSelectedCallback: null
--- a/quickshell/Modals/FileBrowser/FileBrowserModal.qml
+++ b/quickshell/Modals/FileBrowser/FileBrowserModal.qml
@@ -2,10 +2,13 @@ import Qt.labs.folderlistmodel
 import QtCore
 import QtQuick
 import QtQuick.Controls
+import Quickshell
+import Quickshell.Hyprland
 import Quickshell.Io
 import qs.Common
 import qs.Modals.Common
 import qs.Modals.FileBrowser
+import qs.Services
 import qs.Widgets

 DankModal {
@@ -13,6 +16,13 @@ DankModal {

    layerNamespace: "dms:file-browser"

+    HyprlandFocusGrab {
+        windows: [fileBrowserModal]
+        active: CompositorService.isHyprland && fileBrowserModal.shouldHaveFocus
+    }
+
+    keepPopoutsOpen: true
+
    property string homeDir: StandardPaths.writableLocation(StandardPaths.HomeLocation)
    property string docsDir: StandardPaths.writableLocation(StandardPaths.DocumentsLocation)
    property string musicDir: StandardPaths.writableLocation(StandardPaths.MusicLocation)
--- a/quickshell/Modals/NotificationModal.qml
+++ b/quickshell/Modals/NotificationModal.qml
@@ -1,4 +1,6 @@
 import QtQuick
+import Quickshell
+import Quickshell.Hyprland
 import Quickshell.Io
 import qs.Common
 import qs.Modals.Common
@@ -11,6 +13,11 @@ DankModal {

    layerNamespace: "dms:notification-center-modal"

+    HyprlandFocusGrab {
+        windows: [notificationModal]
+        active: CompositorService.isHyprland && notificationModal.shouldHaveFocus
+    }
+
    property bool notificationModalOpen: false
    property var notificationListRef: null

--- a/quickshell/Modals/PolkitAuthModal.qml
+++ b/quickshell/Modals/PolkitAuthModal.qml
@@ -1,4 +1,6 @@
 import QtQuick
+import Quickshell
+import Quickshell.Hyprland
 import qs.Common
 import qs.Modals.Common
 import qs.Services
@@ -9,6 +11,11 @@ DankModal {

    layerNamespace: "dms:polkit"

+    HyprlandFocusGrab {
+        windows: [root]
+        active: CompositorService.isHyprland && root.shouldHaveFocus
+    }
+
    property string passwordInput: ""
    property var currentFlow: PolkitService.agent?.flow
    property bool isLoading: false
--- a/quickshell/Modals/PowerMenuModal.qml
+++ b/quickshell/Modals/PowerMenuModal.qml
@@ -1,5 +1,6 @@
 import QtQuick
 import Quickshell
+import Quickshell.Hyprland
 import qs.Common
 import qs.Modals.Common
 import qs.Services
@@ -10,6 +11,11 @@ DankModal {

    layerNamespace: "dms:power-menu"

+    HyprlandFocusGrab {
+        windows: [root]
+        active: CompositorService.isHyprland && root.shouldHaveFocus
+    }
+
    property int selectedIndex: 0
    property int selectedRow: 0
    property int selectedCol: 0
--- a/quickshell/Modals/Settings/SettingsModal.qml
+++ b/quickshell/Modals/Settings/SettingsModal.qml
@@ -1,5 +1,7 @@
 import QtQuick
 import QtQuick.Effects
+import Quickshell
+import Quickshell.Hyprland
 import Quickshell.Io
 import qs.Common
 import qs.Modals.Common
@@ -13,6 +15,11 @@ DankModal {

    layerNamespace: "dms:settings"

+    HyprlandFocusGrab {
+        windows: [settingsModal]
+        active: CompositorService.isHyprland && settingsModal.shouldHaveFocus
+    }
+
    property Component settingsContent
    property alias profileBrowser: profileBrowser
    property int currentTabIndex: 0
--- a/quickshell/Modals/Spotlight/SpotlightModal.qml
+++ b/quickshell/Modals/Spotlight/SpotlightModal.qml
@@ -1,6 +1,7 @@
 import QtQuick
 import QtQuick.Controls
 import Quickshell
+import Quickshell.Hyprland
 import Quickshell.Io
 import Quickshell.Widgets
 import qs.Common
@@ -14,6 +15,11 @@ DankModal {

    layerNamespace: "dms:spotlight"

+    HyprlandFocusGrab {
+        windows: [spotlightModal]
+        active: CompositorService.isHyprland && spotlightModal.shouldHaveFocus
+    }
+
    property bool spotlightOpen: false
    property alias spotlightContent: spotlightContentInstance

--- a/quickshell/Modals/WifiPasswordModal.qml
+++ b/quickshell/Modals/WifiPasswordModal.qml
@@ -1,4 +1,6 @@
 import QtQuick
+import Quickshell
+import Quickshell.Hyprland
 import qs.Common
 import qs.Modals.Common
 import qs.Services
@@ -9,6 +11,11 @@ DankModal {

    layerNamespace: "dms:wifi-password"

+    HyprlandFocusGrab {
+        windows: [root]
+        active: CompositorService.isHyprland && root.shouldHaveFocus
+    }
+
    property string wifiPasswordSSID: ""
    property string wifiPasswordInput: ""
    property string wifiUsernameInput: ""
--- a/quickshell/Modules/ControlCenter/Components/DragDropGrid.qml
+++ b/quickshell/Modules/ControlCenter/Components/DragDropGrid.qml
@@ -593,13 +593,13 @@ Column {
            text: {
                switch (widgetData.id || "") {
                case "nightMode":
-                    return "Night Mode"
+                    return I18n.tr("Night Mode")
                case "darkMode":
-                    return SessionData.isLightMode ? "Light Mode" : "Dark Mode"
+                    return I18n.tr("Dark Mode")
                case "doNotDisturb":
-                    return "Do Not Disturb"
+                    return I18n.tr("Do Not Disturb")
                case "idleInhibitor":
-                    return SessionService.idleInhibited ? "Keeping Awake" : "Keep Awake"
+                    return SessionService.idleInhibited ? I18n.tr("Keeping Awake") : I18n.tr("Keep Awake")
                default:
                    return "Unknown"
                }
@@ -619,7 +619,7 @@ Column {
                case "nightMode":
                    return DisplayService.nightModeEnabled || false
                case "darkMode":
-                    return SessionData.isLightMode
+                    return !SessionData.isLightMode
                case "doNotDisturb":
                    return SessionData.doNotDisturb || false
                case "idleInhibitor":
@@ -700,7 +700,7 @@ Column {
                case "nightMode":
                    return DisplayService.nightModeEnabled || false
                case "darkMode":
-                    return SessionData.isLightMode
+                    return !SessionData.isLightMode
                case "doNotDisturb":
                    return SessionData.doNotDisturb || false
                case "idleInhibitor":
--- a/quickshell/Modules/ControlCenter/Widgets/AudioSliderRow.qml
+++ b/quickshell/Modules/ControlCenter/Widgets/AudioSliderRow.qml
@@ -69,6 +69,15 @@ Row {
        valueOverride: actualVolumePercent
        thumbOutlineColor: Theme.surfaceContainer
        trackColor: root.sliderTrackColor.a > 0 ? root.sliderTrackColor : Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+
+        onIsDraggingChanged: {
+            if (isDragging) {
+                AudioService.suppressOSD = true
+            } else {
+                Qt.callLater(() => { AudioService.suppressOSD = false })
+            }
+        }
+
        onSliderValueChanged: function(newValue) {
            if (defaultSink) {
                defaultSink.audio.volume = newValue / 100.0
--- a/quickshell/Modules/ControlCenter/Widgets/BrightnessSliderRow.qml
+++ b/quickshell/Modules/ControlCenter/Widgets/BrightnessSliderRow.qml
@@ -143,6 +143,8 @@ Row {
    }

    DankSlider {
+        id: brightnessSlider
+
        anchors.verticalCenter: parent.verticalCenter
        width: parent.width - (Theme.iconSize + Theme.spacingS * 2)
        enabled: DisplayService.brightnessAvailable && targetDeviceName.length > 0
@@ -162,7 +164,7 @@ Row {
            }
            return targetDevice.displayMax || 100
        }
-        value: targetBrightness
+        value: !isDragging ? targetBrightness : value
        showValue: true
        unit: {
            if (!targetDevice) return "%"
--- a/quickshell/Modules/DankBar/DankBarContent.qml
+++ b/quickshell/Modules/DankBar/DankBarContent.qml
@@ -635,7 +635,7 @@ Item {
        id: systemTrayComponent

        SystemTrayBar {
-            parentWindow: rootWindow
+            parentWindow: barWindow
            parentScreen: barWindow.screen
            widgetThickness: barWindow.widgetThickness
            isAtBottom: SettingsData.dankBarPosition === SettingsData.Position.Bottom
@@ -981,7 +981,7 @@ Item {
            section: topBarContent.getWidgetSection(parent) || "right"
            parentScreen: barWindow.screen
            onColorPickerRequested: {
-                rootWindow.colorPickerRequested()
+                barWindow.colorPickerRequested()
            }
        }
    }
--- a/quickshell/Modules/DankBar/Widgets/SystemTrayBar.qml
+++ b/quickshell/Modules/DankBar/Widgets/SystemTrayBar.qml
@@ -530,6 +530,7 @@ Item {

        Item {
            id: menuContainer
+            objectName: "overflowMenuContainer"

            readonly property real rawWidth: {
                const itemCount = root.hiddenBarItems.length
@@ -724,8 +725,7 @@ Item {

                                if (!trayItem.hasMenu) return

-                                root.menuOpen = false
-                                root.showForTrayItem(trayItem, parent, parentScreen, root.isAtBottom, root.isVertical, root.axis)
+                                root.showForTrayItem(trayItem, menuContainer, parentScreen, root.isAtBottom, root.isVertical, root.axis)
                            }
                        }
                    }
@@ -911,10 +911,10 @@ Item {

                onVisibleChanged: {
                    if (visible) {
+                        updatePosition()
                        root.menuOpen = false
                        PopoutManager.closeAllPopouts()
                        ModalManager.closeAllModalsExcept(null)
-                        updatePosition()
                    }
                }

@@ -954,11 +954,20 @@ Item {

                function updatePosition() {
                    const targetItem = (typeof menuRoot !== "undefined" && menuRoot.anchorItem) ? menuRoot.anchorItem : root
-                    const globalPos = targetItem.mapToGlobal(0, 0)
-                    const screenX = screen.x || 0
-                    const screenY = screen.y || 0
-                    const relativeX = globalPos.x - screenX
-                    const relativeY = globalPos.y - screenY
+
+                    const isFromOverflowMenu = targetItem.objectName === "overflowMenuContainer"
+
+                    let relativeX, relativeY
+                    if (isFromOverflowMenu) {
+                        relativeX = targetItem.x
+                        relativeY = targetItem.y
+                    } else {
+                        const globalPos = targetItem.mapToGlobal(0, 0)
+                        const screenX = screen.x || 0
+                        const screenY = screen.y || 0
+                        relativeX = globalPos.x - screenX
+                        relativeY = globalPos.y - screenY
+                    }

                    const widgetThickness = Math.max(20, 26 + SettingsData.dankBarInnerPadding * 0.6)
                    const effectiveBarThickness = Math.max(widgetThickness + SettingsData.dankBarInnerPadding + 4, Theme.barHeight - 4 - (8 - SettingsData.dankBarInnerPadding))
--- a/quickshell/Modules/DankDash/DankDashPopout.qml
+++ b/quickshell/Modules/DankDash/DankDashPopout.qml
@@ -292,6 +292,7 @@ DankPopout {
                        tabBarItem: tabBar
                        keyForwardTarget: mainContainer
                        targetScreen: root.triggerScreen
+                        parentPopout: root
                    }

                    WeatherTab {
--- a/quickshell/Modules/DankDash/WallpaperTab.qml
+++ b/quickshell/Modules/DankDash/WallpaperTab.qml
@@ -5,6 +5,7 @@ import QtQuick.Controls
 import QtQuick.Effects
 import QtQuick.Layouts
 import Quickshell
+import Quickshell.Wayland
 import qs.Common
 import qs.Modals.FileBrowser
 import qs.Services
@@ -25,6 +26,7 @@ Item {
    property Item tabBarItem: null
    property int gridIndex: 0
    property Item keyForwardTarget: null
+    property var parentPopout: null
    property int lastPage: 0
    property bool enableAnimation: false
    property string homeDir: StandardPaths.writableLocation(StandardPaths.HomeLocation)
@@ -293,6 +295,12 @@ Item {
        active: false
        asynchronous: true

+        onActiveChanged: {
+            if (active && parentPopout) {
+                parentPopout.WlrLayershell.keyboardFocus = WlrKeyboardFocus.None
+            }
+        }
+
        sourceComponent: FileBrowserModal {
            Component.onCompleted: {
                open()
@@ -318,6 +326,13 @@ Item {
                            }

            onDialogClosed: {
+                if (parentPopout) {
+                    if (CompositorService.isHyprland) {
+                        parentPopout.WlrLayershell.keyboardFocus = WlrKeyboardFocus.OnDemand
+                    } else {
+                        parentPopout.WlrLayershell.keyboardFocus = WlrKeyboardFocus.Exclusive
+                    }
+                }
                Qt.callLater(() => wallpaperBrowserLoader.active = false)
            }
        }
--- a/quickshell/Services/AudioService.qml
+++ b/quickshell/Services/AudioService.qml
@@ -412,7 +412,7 @@ Singleton {
        interval: 50
        repeat: false
        onTriggered: {
-            if (!root.suppressOSD && SettingsData.soundsEnabled && SettingsData.soundVolumeChanged) {
+            if (SettingsData.soundsEnabled && SettingsData.soundVolumeChanged) {
                root.playVolumeChangeSound()
            }
        }
--- a/quickshell/VERSION
+++ b/quickshell/VERSION
@@ -1 +1 @@
-v0.6.0
+v0.6.2
Author	SHA1	Message	Date
bbedward	2ed6c33c83	missing import	2025-11-19 19:14:47 -05:00
bbedward	7ad532ed17	dankinstall: add ultramarine	2025-11-19 18:53:41 -05:00
bbedward	92fe8c5b14	hyprland: restore focus grab to tray menus	2025-11-19 17:24:14 -05:00
bbedward	8e95572589	modals: move HyprFocusGrab out of common Modal	2025-11-19 17:16:51 -05:00
bbedward	62da862a66	modal: round textureSize pixels	2025-11-19 14:36:08 -05:00
bbedward	993e34f548	dankinstall: weakdeps for niri/system	2025-11-19 09:35:22 -05:00
github-actions[bot]	e39465aece	chore: bump version to v0.6.2	2025-11-19 13:54:50 +00:00
bbedward	8fd616b680	osd: suppression fix from cc	2025-11-19 08:52:37 -05:00
bbedward	cc054b27de	filebrowser: fix auto closing from ddash	2025-11-19 08:33:07 -05:00
github-actions[bot]	dfdaa82245	chore: bump version to v0.6.1	2025-11-19 03:16:35 +00:00
bbedward	99a307e0ad	dankbar: hot fix color moda & systm tray item positions	2025-11-18 22:13:06 -05:00