feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

FakeVim: Add checks before handling keyboard input

Browse Source 
Some inputs can be unrecognized with some keyboard layouts
(QKeyEvent::key() will return 0).

Change-Id: If7b49330ac00a2493a956331c7bbe8ea2a4305ae
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Lukas Holecek
2015-12-16 14:10:44 +01:00
committed by hjk
parent e31de93ba6
commit a5b85651dd
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/fakevim/fakevimhandler.cpp
View File

@@ -2531,10 +2531,14 @@ EventResult FakeVimHandler::Private::handleEvent(QKeyEvent *ev)
// || !atBlockEnd() || block().length() <= 1,
// qDebug() << "Cursor at EOL before key handler");
enterFakeVim();
EventResult result = handleKey(Input(key, mods, ev->text()));
leaveFakeVim(result);
const Input input(key, mods, ev->text());
const QString text = ev->text();
if (!input.isValid())
return EventUnhandled;
enterFakeVim();
EventResult result = handleKey(input);
leaveFakeVim(result);
return result;
}
@@ -2786,6 +2790,8 @@ EventResult FakeVimHandler::Private::handleCurrentMapAsDefault()
{
// If mapping has failed take the first input from it and try default command.
const Inputs &inputs = g.currentMap.currentInputs();
if (inputs.isEmpty())
return EventHandled;
Input in = inputs.front();
if (inputs.size() > 1)