ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make code completion work on macOS

Browse Source
This commit is contained in:
Michael Zanetti 2019-12-02 13:29:03 +01:00
parent 820f0002fd
commit 02036d4b46
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libnymea-app-core/scripting/codecompletion.cpp
View File

@ -126,7 +126,7 @@ void CodeCompletion::update()
QList<CompletionModel::Entry> entries; QList<CompletionModel::Entry> entries;
QRegExp deviceIdExp(".*deviceId: \"[a-zA-Z0-9-]*"); QRegExp deviceIdExp(".*deviceId: \"[a-zA-Z0-9- ]*");
if (deviceIdExp.exactMatch(blockText)) { if (deviceIdExp.exactMatch(blockText)) {
for (int i = 0; i < m_engine->deviceManager()->devices()->rowCount(); i++) { for (int i = 0; i < m_engine->deviceManager()->devices()->rowCount(); i++) {
Device *dev = m_engine->deviceManager()->devices()->get(i); Device *dev = m_engine->deviceManager()->devices()->get(i);

10
nymea-app/ui/magic/ScriptEditor.qml
View File

@ -188,6 +188,10 @@ Page {
} }
} }
function controlPressed(event) {
return event.modifiers & Qt.ControlModifier || event.modifiers & Qt.MetaModifier
}
Keys.onPressed: { Keys.onPressed: {
print("key", event.key, "Completion box visible:", completionBox.visible) print("key", event.key, "Completion box visible:", completionBox.visible)
// Things to happen only when we're not autocompleting // Things to happen only when we're not autocompleting
@ -199,7 +203,7 @@ Page {
event.accepted = true; event.accepted = true;
return; return;
case Qt.Key_Space: case Qt.Key_Space:
if (!completionBox.visible && (event.modifiers & Qt.ControlModifier)) { if (!completionBox.visible && controlPressed(event)) {
completion.update(); completion.update();
completionBox.show(); completionBox.show();
return; return;
@ -246,14 +250,14 @@ Page {
event.accepted = true; event.accepted = true;
return; return;
case Qt.Key_Plus: case Qt.Key_Plus:
if (event.modifiers & Qt.ControlModifier) { if (controlPressed(event)) {
scriptEdit.font.pixelSize++; scriptEdit.font.pixelSize++;
event.accepted = true; event.accepted = true;
return; return;
} }
break; break;
case Qt.Key_Minus: case Qt.Key_Minus:
if (event.modifiers & Qt.ControlModifier) { if (controlPressed(event)) {
scriptEdit.font.pixelSize--; scriptEdit.font.pixelSize--;
event.accepted = true; event.accepted = true;
return; return;