From b7062fe40ca2ee2d72cbce1d016e3f68116e1f35 Mon Sep 17 00:00:00 2001 From: bbedward Date: Mon, 8 Dec 2025 14:02:58 -0500 Subject: [PATCH] windows: dont close on esc fixes #911 --- quickshell/Modals/FileBrowser/FileBrowserContent.qml | 3 ++- quickshell/Modals/FileBrowser/FileBrowserModal.qml | 1 + quickshell/Modals/ProcessListModal.qml | 6 ------ quickshell/Modals/Settings/SettingsModal.qml | 5 ----- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/quickshell/Modals/FileBrowser/FileBrowserContent.qml b/quickshell/Modals/FileBrowser/FileBrowserContent.qml index e00768f2..7ea4ee9f 100644 --- a/quickshell/Modals/FileBrowser/FileBrowserContent.qml +++ b/quickshell/Modals/FileBrowser/FileBrowserContent.qml @@ -46,6 +46,7 @@ FocusScope { property bool pathInputHasFocus: false property int actualGridColumns: 5 property bool _initialized: false + property bool closeOnEscape: true signal fileSelected(string path) signal closeRequested @@ -298,7 +299,7 @@ FocusScope { property int gridColumns: viewMode === "list" ? 1 : Math.max(1, actualGridColumns) function handleKey(event) { - if (event.key === Qt.Key_Escape) { + if (event.key === Qt.Key_Escape && root.closeOnEscape) { closeRequested(); event.accepted = true; return; diff --git a/quickshell/Modals/FileBrowser/FileBrowserModal.qml b/quickshell/Modals/FileBrowser/FileBrowserModal.qml index 29ddd37c..4b13b51b 100644 --- a/quickshell/Modals/FileBrowser/FileBrowserModal.qml +++ b/quickshell/Modals/FileBrowser/FileBrowserModal.qml @@ -59,6 +59,7 @@ FloatingWindow { id: content anchors.fill: parent focus: true + closeOnEscape: false browserTitle: fileBrowserModal.browserTitle browserIcon: fileBrowserModal.browserIcon diff --git a/quickshell/Modals/ProcessListModal.qml b/quickshell/Modals/ProcessListModal.qml index 575287b5..b934f0c9 100644 --- a/quickshell/Modals/ProcessListModal.qml +++ b/quickshell/Modals/ProcessListModal.qml @@ -112,12 +112,6 @@ FloatingWindow { focus: true Keys.onPressed: event => { - if (event.key === Qt.Key_Escape) { - hide(); - event.accepted = true; - return; - } - switch (event.key) { case Qt.Key_1: currentTab = 0; diff --git a/quickshell/Modals/Settings/SettingsModal.qml b/quickshell/Modals/Settings/SettingsModal.qml index ba4be3e4..48fc9bfb 100644 --- a/quickshell/Modals/Settings/SettingsModal.qml +++ b/quickshell/Modals/Settings/SettingsModal.qml @@ -139,11 +139,6 @@ FloatingWindow { focus: true Keys.onPressed: event => { - if (event.key === Qt.Key_Escape) { - hide(); - event.accepted = true; - return; - } if (event.key === Qt.Key_Down || (event.key === Qt.Key_Tab && !event.modifiers)) { sidebar.navigateNext(); event.accepted = true;