Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix HShortcutHandler not processing shortcuts

Browse Source
This commit is contained in:
miruka
2019-08-31 15:34:05 -04:00
parent 8d1c02f44f
commit 28d8721fe2
3 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/python/config_files.py
View File

@@ -108,8 +108,8 @@ class UISettings(JSONConfigFile):
"theme": "Default.qpl",
"writeAliases": {},
"keys": {
"startDebugger": ["Alt+Shift+D"],
"reloadConfig": "Alt+Shift+R",
"startDebugger": "Alt+Shift+D",
"reloadConfig": "Alt+Shift+R",
"scrollUp": ["Alt+Up", "Alt+K"],
"scrollDown": ["Alt+Down", "Alt+J"],

3
src/qml/Base/HShortcut.qml
View File

@@ -5,7 +5,6 @@ QtObject {
signal held(var event)
signal released(var event)
property bool enabled: true
property var sequences: "" // string or array of strings
property var sequences: "" // shortcut string array of shortcut strings
}

38
src/qml/Base/HShortcutHandler.qml
View File

@@ -22,6 +22,25 @@ Item {
})
function match(event) {
for (let i = 0; i < shortcutHandler.resources.length; i++) {
let shortcut = shortcutHandler.resources[i]
if (! shortcut.enabled) continue
if (typeof(shortcut.sequences) == "string") {
shortcut.sequences = [shortcut.sequences]
}
for (let i = 0; i < shortcut.sequences.length; i++) {
if (sequenceMatches(event, shortcut.sequences[i])) {
return shortcut
}
}
}
return null
}
function sequenceMatches(event, sequence) {
let [key, ...mods] = sequence.split("+").reverse()
@@ -37,23 +56,4 @@ Item {
return true
}
function match(event) {
for (let i = 0; i < shortcutHandler.resources.length; i++) {
let shortcut = shortcutHandler.resources[i]
if (! shortcut.enabled) continue
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])) {
return shortcut
}
}
}
return null
}
}