1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-06-18 09:05:24 -04:00

fix(popouts): keep Hyprland focus during close (#2655)

This commit is contained in:
Ralph Zhou
2026-06-18 13:41:25 +08:00
committed by GitHub
parent 9f4123cc3c
commit 2f37019782
3 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -63,7 +63,7 @@ Item {
list.push(root.backgroundWindow);
return list.concat(KeyboardFocus.barWindows);
}
active: KeyboardFocus.wantsGrab(root.shouldBeVisible, root.customKeyboardFocus)
active: KeyboardFocus.wantsGrab(root.shouldBeVisible || root.isClosing, root.customKeyboardFocus)
}
Loader {
+2 -2
View File
@@ -493,8 +493,8 @@ Item {
interval: Theme.variantCloseInterval(animationDuration)
onTriggered: {
if (!shouldBeVisible) {
isClosing = false;
contentWindow.visible = false;
isClosing = false;
PopoutManager.hidePopout(popoutHandle);
popoutClosed();
}
@@ -782,7 +782,7 @@ Item {
WlrLayershell.namespace: root.layerNamespace
WlrLayershell.layer: root.effectivePopoutLayer
WlrLayershell.exclusiveZone: -1
WlrLayershell.keyboardFocus: KeyboardFocus.keyboardFocus(shouldBeVisible, customKeyboardFocus)
WlrLayershell.keyboardFocus: KeyboardFocus.keyboardFocus(shouldBeVisible || isClosing, customKeyboardFocus)
readonly property bool _fullHeight: root.fullHeightSurface
anchors {
+2 -2
View File
@@ -376,9 +376,9 @@ Item {
interval: Theme.variantCloseInterval(animationDuration)
onTriggered: {
if (!shouldBeVisible) {
isClosing = false;
contentWindow.visible = false;
backgroundWindow.visible = false;
isClosing = false;
PopoutManager.hidePopout(popoutHandle);
popoutClosed();
}
@@ -607,7 +607,7 @@ Item {
WlrLayershell.namespace: root.layerNamespace
WlrLayershell.layer: root.effectivePopoutLayer
WlrLayershell.exclusiveZone: -1
WlrLayershell.keyboardFocus: KeyboardFocus.keyboardFocus(shouldBeVisible, customKeyboardFocus)
WlrLayershell.keyboardFocus: KeyboardFocus.keyboardFocus(shouldBeVisible || isClosing, customKeyboardFocus)
anchors {
left: true