mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-06-21 02:25:21 -04:00
fix(popouts): keep Hyprland focus during close (#2655)
This commit is contained in:
@@ -63,7 +63,7 @@ Item {
|
|||||||
list.push(root.backgroundWindow);
|
list.push(root.backgroundWindow);
|
||||||
return list.concat(KeyboardFocus.barWindows);
|
return list.concat(KeyboardFocus.barWindows);
|
||||||
}
|
}
|
||||||
active: KeyboardFocus.wantsGrab(root.shouldBeVisible, root.customKeyboardFocus)
|
active: KeyboardFocus.wantsGrab(root.shouldBeVisible || root.isClosing, root.customKeyboardFocus)
|
||||||
}
|
}
|
||||||
|
|
||||||
Loader {
|
Loader {
|
||||||
|
|||||||
@@ -493,8 +493,8 @@ Item {
|
|||||||
interval: Theme.variantCloseInterval(animationDuration)
|
interval: Theme.variantCloseInterval(animationDuration)
|
||||||
onTriggered: {
|
onTriggered: {
|
||||||
if (!shouldBeVisible) {
|
if (!shouldBeVisible) {
|
||||||
isClosing = false;
|
|
||||||
contentWindow.visible = false;
|
contentWindow.visible = false;
|
||||||
|
isClosing = false;
|
||||||
PopoutManager.hidePopout(popoutHandle);
|
PopoutManager.hidePopout(popoutHandle);
|
||||||
popoutClosed();
|
popoutClosed();
|
||||||
}
|
}
|
||||||
@@ -782,7 +782,7 @@ Item {
|
|||||||
WlrLayershell.namespace: root.layerNamespace
|
WlrLayershell.namespace: root.layerNamespace
|
||||||
WlrLayershell.layer: root.effectivePopoutLayer
|
WlrLayershell.layer: root.effectivePopoutLayer
|
||||||
WlrLayershell.exclusiveZone: -1
|
WlrLayershell.exclusiveZone: -1
|
||||||
WlrLayershell.keyboardFocus: KeyboardFocus.keyboardFocus(shouldBeVisible, customKeyboardFocus)
|
WlrLayershell.keyboardFocus: KeyboardFocus.keyboardFocus(shouldBeVisible || isClosing, customKeyboardFocus)
|
||||||
|
|
||||||
readonly property bool _fullHeight: root.fullHeightSurface
|
readonly property bool _fullHeight: root.fullHeightSurface
|
||||||
anchors {
|
anchors {
|
||||||
|
|||||||
@@ -376,9 +376,9 @@ Item {
|
|||||||
interval: Theme.variantCloseInterval(animationDuration)
|
interval: Theme.variantCloseInterval(animationDuration)
|
||||||
onTriggered: {
|
onTriggered: {
|
||||||
if (!shouldBeVisible) {
|
if (!shouldBeVisible) {
|
||||||
isClosing = false;
|
|
||||||
contentWindow.visible = false;
|
contentWindow.visible = false;
|
||||||
backgroundWindow.visible = false;
|
backgroundWindow.visible = false;
|
||||||
|
isClosing = false;
|
||||||
PopoutManager.hidePopout(popoutHandle);
|
PopoutManager.hidePopout(popoutHandle);
|
||||||
popoutClosed();
|
popoutClosed();
|
||||||
}
|
}
|
||||||
@@ -607,7 +607,7 @@ Item {
|
|||||||
WlrLayershell.namespace: root.layerNamespace
|
WlrLayershell.namespace: root.layerNamespace
|
||||||
WlrLayershell.layer: root.effectivePopoutLayer
|
WlrLayershell.layer: root.effectivePopoutLayer
|
||||||
WlrLayershell.exclusiveZone: -1
|
WlrLayershell.exclusiveZone: -1
|
||||||
WlrLayershell.keyboardFocus: KeyboardFocus.keyboardFocus(shouldBeVisible, customKeyboardFocus)
|
WlrLayershell.keyboardFocus: KeyboardFocus.keyboardFocus(shouldBeVisible || isClosing, customKeyboardFocus)
|
||||||
|
|
||||||
anchors {
|
anchors {
|
||||||
left: true
|
left: true
|
||||||
|
|||||||
Reference in New Issue
Block a user