fix: the numeric keypad cannot input

使用 Keys.forwardTo 代替判断 event.text Issues: linuxdeepin/developer-center#8495
linuxdeepin · Jun 13, 2024 · a6d4ab2 · a6d4ab2
1 parent b637558
commit a6d4ab2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/qml/FullscreenFrame.qml b/qml/FullscreenFrame.qml
@@ -546,6 +546,7 @@ Control {
                 }
             }
             onTextChanged: {
+                searchEdit.focus = true
                 SearchFilterProxyModel.setFilterRegularExpression(text.trim())
                 // reset highlighted item
                 if (searchResultGridViewContainer.visible) {
@@ -562,15 +563,9 @@ Control {
         cs: searchResultGridViewContainer.cellHeight
     }
 
+    Keys.forwardTo: [searchEdit]
     Keys.onPressed: {
-        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
-            } else {
-                searchEdit.text = event.text
-            }
-        } else if (baseLayer.focus === true) {
+        if (baseLayer.focus === true) {
             // the SearchEdit will catch the key event first, and events that it won't accept will then got here
             switch (event.key) {
             case Qt.Key_Up:

diff --git a/qml/windowed/BottomBar.qml b/qml/windowed/BottomBar.qml
@@ -59,6 +59,7 @@ Control {
 
                 onTextChanged: {
                     console.log(text)
+                    searchEdit.focus = true
                     SearchFilterProxyModel.setFilterRegularExpression(text.trim())
                     SearchFilterProxyModel.invalidate()
                 }

diff --git a/qml/windowed/WindowedFrame.qml b/qml/windowed/WindowedFrame.qml
@@ -181,11 +181,9 @@ Item {
         }
     }
 
+    Keys.forwardTo: [bottomBar.searchEdit]
     Keys.onPressed: function (event) {
-        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) {
+        if (bottomBar.searchEdit.focus === true || baseLayer.focus === true) {
             // the SearchEdit will catch the key event first, and events that it won't accept will then got here
             switch (event.key) {
             case Qt.Key_Up: