Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-06-07 19:59:14 -04:00
Code Packages Releases Activity

notification: fix modal escape key handling in connected mode

Browse Source 
fixes #2566
This commit is contained in:
bbedward
2026-06-03 10:49:51 -04:00
parent 2f2d4c9d9b
commit e5fff91ae6
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Modals/Common/DankModalConnected.qml
+3 -4
View File
@@ -262,6 +262,7 @@ Item {
clickCatcher.visible = true; clickCatcher.visible = true;
if (!contentWindow.visible) if (!contentWindow.visible)
contentWindow.visible = true; contentWindow.visible = true;
opened();
shouldHaveFocus = false; shouldHaveFocus = false;
Qt.callLater(() => shouldHaveFocus = Qt.binding(() => shouldBeVisible)); Qt.callLater(() => shouldHaveFocus = Qt.binding(() => shouldBeVisible));
}); });
@@ -535,15 +536,13 @@ Item {
implicitHeight: root.useSingleWindow ? 0 : root.alignedHeight + (shadowBuffer * 2) implicitHeight: root.useSingleWindow ? 0 : root.alignedHeight + (shadowBuffer * 2)
onVisibleChanged: { onVisibleChanged: {
if (visible) { if (visible)
opened(); return;
} else {
if (Qt.inputMethod) { if (Qt.inputMethod) {
Qt.inputMethod.hide(); Qt.inputMethod.hide();
Qt.inputMethod.reset(); Qt.inputMethod.reset();
} }
} }
}
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
quickshell/Modals/Common/DankModalStandalone.qml
+3 -4
View File
@@ -90,6 +90,7 @@ Item {
if (!useSingleWindow) if (!useSingleWindow)
clickCatcher.visible = true; clickCatcher.visible = true;
contentWindow.visible = true; contentWindow.visible = true;
opened();
shouldHaveFocus = false; shouldHaveFocus = false;
Qt.callLater(() => shouldHaveFocus = Qt.binding(() => shouldBeVisible)); Qt.callLater(() => shouldHaveFocus = Qt.binding(() => shouldBeVisible));
} }
@@ -286,15 +287,13 @@ Item {
implicitHeight: root.useSingleWindow ? 0 : root.alignedHeight + (shadowBuffer * 2) implicitHeight: root.useSingleWindow ? 0 : root.alignedHeight + (shadowBuffer * 2)
onVisibleChanged: { onVisibleChanged: {
if (visible) { if (visible)
opened(); return;
} else {
if (Qt.inputMethod) { if (Qt.inputMethod) {
Qt.inputMethod.hide(); Qt.inputMethod.hide();
Qt.inputMethod.reset(); Qt.inputMethod.reset();
} }
} }
}
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent