From 63575fd82c7003e7b031b5bf5fbb8ca9b50530e0 Mon Sep 17 00:00:00 2001 From: Wang Zichong Date: Fri, 10 May 2024 11:27:08 +0800 Subject: [PATCH] fix: numpad quick search not working We should at least also check keypad modifier as well Related: linuxdeepin/dde-launchpad#269 Issue: linuxdeepin/developer-center#8495 --- qml/FullscreenFrame.qml | 2 +- qml/windowed/WindowedFrame.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qml/FullscreenFrame.qml b/qml/FullscreenFrame.qml index 5ef5e030..6f7faff4 100644 --- a/qml/FullscreenFrame.qml +++ b/qml/FullscreenFrame.qml @@ -555,7 +555,7 @@ Control { } Keys.onPressed: { - if (searchEdit.focus === false && ((event.modifiers === Qt.NoModifier || event.modifiers === Qt.ShiftModifier) && event.text && !"\t\r\0 ".includes(event.text))) { + if (searchEdit.focus === false && ((event.modifiers === Qt.NoModifier || event.modifiers === Qt.ShiftModifier || event.modifiers === Qt.KeypadModifier) && event.text && !"\t\r\0 ".includes(event.text))) { searchEdit.focus = true if (searchEdit.text) { searchEdit.text += event.text diff --git a/qml/windowed/WindowedFrame.qml b/qml/windowed/WindowedFrame.qml index acad114e..aa6ff56f 100644 --- a/qml/windowed/WindowedFrame.qml +++ b/qml/windowed/WindowedFrame.qml @@ -183,7 +183,7 @@ Item { } Keys.onPressed: function (event) { - if (bottomBar.searchEdit.focus === false && !bottomBar.searchEdit.text && ((event.modifiers === Qt.NoModifier || event.modifiers === Qt.ShiftModifier) && event.text && !"\t\r\0 ".includes(event.text))) { + if (bottomBar.searchEdit.focus === false && !bottomBar.searchEdit.text && ((event.modifiers === Qt.NoModifier || event.modifiers === Qt.ShiftModifier || event.modifiers === Qt.KeypadModifier) && event.text && !"\t\r\0 ".includes(event.text))) { bottomBar.searchEdit.focus = true bottomBar.searchEdit.text = event.text } else if (bottomBar.searchEdit.focus === true || baseLayer.focus === true) {