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

FakeVim: Fix cursor position and anchor after search

Browse Source 
Change-Id: I1e093d042033d87f0382560e00f71d24c7f55b03
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hluk
2013-06-09 15:23:44 +02:00
committed by hjk
parent f20dd4f966
commit 8c944eda89
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4781,8 +4781,8 @@ EventResult FakeVimHandler::Private::handleSearchSubSubMode(const Input &input)
} }
if (g.currentMessage.isEmpty()) if (g.currentMessage.isEmpty())
showMessage(MessageCommand, g.searchBuffer.display()); showMessage(MessageCommand, g.searchBuffer.display());
else else if (g.currentMessageLevel == MessageError)
handled = EventCancelled; handled = EventCancelled; // Not found so cancel mapping if any.
enterCommandMode(g.returnToMode); enterCommandMode(g.returnToMode);
resetCommandMode(); resetCommandMode();
g.searchBuffer.clear(); g.searchBuffer.clear();
@@ -6033,7 +6033,10 @@ void FakeVimHandler::Private::miniBufferTextEdited(const QString &text, int curs
editor()->setFocus(); editor()->setFocus();
} else if (text.isEmpty()) { } else if (text.isEmpty()) {
// editing cancelled // editing cancelled
enterFakeVim();
handleDefaultKey(Input(Qt::Key_Escape, Qt::NoModifier, QString())); handleDefaultKey(Input(Qt::Key_Escape, Qt::NoModifier, QString()));
leaveFakeVim();
editor()->setFocus(); editor()->setFocus();
updateCursorShape(); updateCursorShape();
} else { } else {