diff --git a/dank-qml-common b/dank-qml-common index b2fc1ab68..5aa2052d1 160000 --- a/dank-qml-common +++ b/dank-qml-common @@ -1 +1 @@ -Subproject commit b2fc1ab68d7f0d5a92549b716f37e771662c154d +Subproject commit 5aa2052d1c5332a4728d8b676f49d63258e5e14d diff --git a/flake.lock b/flake.lock index 09022dea7..0211339fe 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "dank-qml-common": { "flake": false, "locked": { - "lastModified": 1789679713, - "narHash": "sha256-H2eceA9sHCRUg2x2jcgPExklflHSznCB+YPyx/DQ0dg=", + "lastModified": 1789687849, + "narHash": "sha256-yP9cklRRAGI5E6Ep5vC4QZtD4x3ydSmuPMzPL3EU144=", "owner": "AvengeMedia", "repo": "dank-qml-common", - "rev": "b2fc1ab68d7f0d5a92549b716f37e771662c154d", + "rev": "5aa2052d1c5332a4728d8b676f49d63258e5e14d", "type": "github" }, "original": { diff --git a/quickshell/Modals/DankLauncherV2/ResultsList.qml b/quickshell/Modals/DankLauncherV2/ResultsList.qml index f4dd1da0a..10ce0b3d6 100644 --- a/quickshell/Modals/DankLauncherV2/ResultsList.qml +++ b/quickshell/Modals/DankLauncherV2/ResultsList.qml @@ -577,7 +577,6 @@ Item { void (stickyHeader.versionTrigger); return root.controller?.canCollapseSection(stickyHeader.stickyHeaderSection?.id) ?? false; } - isSticky: true transientSurfaceTracker: root.transientSurfaceTracker } } @@ -603,7 +602,6 @@ Item { return root.controller?.canChangeSectionViewMode(section?.id ?? "") ?? false; } canCollapse: root.controller?.canCollapseSection(section?.id ?? "") ?? false - isSticky: true popupAbove: true transientSurfaceTracker: root.transientSurfaceTracker } diff --git a/quickshell/Modals/DankLauncherV2/SectionHeader.qml b/quickshell/Modals/DankLauncherV2/SectionHeader.qml index a57f62e77..7836e55fe 100644 --- a/quickshell/Modals/DankLauncherV2/SectionHeader.qml +++ b/quickshell/Modals/DankLauncherV2/SectionHeader.qml @@ -17,7 +17,6 @@ Item { property string viewMode: "list" property bool canChangeViewMode: true property bool canCollapse: true - property bool isSticky: false property bool popupAbove: false property Item popupAboveItem: null property Item focusReturnTarget: null @@ -147,13 +146,4 @@ Item { root.controller.toggleSection(root.section.id); } } - - Rectangle { - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: parent.bottom - height: Theme.dividerWidth - color: Theme.outlineVariant - visible: root.isSticky - } } diff --git a/quickshell/Widgets/DankDropdown.qml b/quickshell/Widgets/DankDropdown.qml index 97a127032..df302eb0c 100644 --- a/quickshell/Widgets/DankDropdown.qml +++ b/quickshell/Widgets/DankDropdown.qml @@ -1,3 +1,7 @@ import qs.DankCommon.Widgets as DankCommon +import qs.Services -DankCommon.DankDropdown {} +DankCommon.DankDropdown { + // Hyprland drops a focus grab when a whitelisted popup takes its own xdg grab + popupGrabsFocus: !(CompositorService.useHyprlandFocusGrab && transientSurfaceTracker) +}