Fix random shortcuts getting triggered

Caused the "window bounces when typing text" bug
2019-08-30 19:06:09 -04:00
parent 6953250e50
commit e506a70767
3 changed files with 8 additions and 6 deletions
--- a/src/qml/Base/HShortcutHandler.qml
+++ b/src/qml/Base/HShortcutHandler.qml
@@ -43,12 +43,15 @@ Item {

            if (! shortcut.enabled) continue

-            if (typeof(shortcut.sequences) == "string" &&
-                sequenceMatches(event, shortcut.sequences)) return shortcut
+            if (typeof(shortcut.sequences) == "string") {
+                return sequenceMatches(event, shortcut.sequences) ?
+                       shortcut : null
+            }

            for (let i = 0;  i < shortcut.sequences.length; i++) {
-                if (sequenceMatches(event, shortcut.sequences[i]))
+                if (sequenceMatches(event, shortcut.sequences[i])) {
                    return shortcut
+                }
            }
        }
        return null