Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-08-10 07:28:30 -04:00
Code Packages Releases Activity

fix(hyprland): don't restore focus to a toplevel on another workspace when a popout closes

Browse Source 
fixes #2963
port 1.5

(cherry picked from commit 0b526d9b05)
This commit is contained in:
bbedward
2026-08-08 10:58:14 -04:00
committed by dms-ci[bot]
parent f971b6bcff
commit a34037f49c
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Widgets/DankFocusGrab.qml
+6 -1
View File
@@ -11,13 +11,17 @@ HyprlandFocusGrab {
property bool _held: false property bool _held: false
property bool _compositorCleared: false property bool _compositorCleared: false
property var _restoreToplevel: null property var _restoreToplevel: null
property int _restoreWorkspaceId: -1
property Timer _releaseTimer: Timer { property Timer _releaseTimer: Timer {
interval: 50 interval: 50
onTriggered: { onTriggered: {
root._held = false; root._held = false;
root.active = false; root.active = false;
root._restoreToplevel = root._compositorCleared ? null : KeyboardFocus.restoreToplevel(root._restoreToplevel); // Restoring a toplevel from another workspace would drag the user back
// to the workspace they just navigated away from (#2963)
const workspaceChanged = (Hyprland.focusedWorkspace?.id ?? -1) !== root._restoreWorkspaceId;
root._restoreToplevel = (root._compositorCleared || workspaceChanged) ? null : KeyboardFocus.restoreToplevel(root._restoreToplevel);
} }
} }
@@ -34,6 +38,7 @@ HyprlandFocusGrab {
_held = true; _held = true;
_compositorCleared = false; _compositorCleared = false;
_restoreToplevel = KeyboardFocus.captureActiveToplevel(); _restoreToplevel = KeyboardFocus.captureActiveToplevel();
_restoreWorkspaceId = Hyprland.focusedWorkspace?.id ?? -1;
active = true; active = true;
} }