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

fakevim: update cursor position to start of selection after incremental search

Browse Source 
the find plugin places the cursor at the end of a found item, but vi at the start,
thus update cursor position when editor widget regains focus

Merge-request: 97
Reviewed-by: hjk <qtc-committer@nokia.com>
This commit is contained in:
Martin Aumüller
2010-01-21 17:23:30 +01:00
committed by hjk
parent d67bd86fb4
commit de21fef76c
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -287,6 +287,7 @@ public:
void finishMovement(const QString &text = QString());
void search(const QString &needle, bool forward);
void highlightMatches(const QString &needle);
void stopIncrementalFind();
int mvCount() const { return m_mvcount.isEmpty() ? 1 : m_mvcount.toInt(); }
int opCount() const { return m_opcount.isEmpty() ? 1 : m_opcount.toInt(); }
@@ -416,6 +417,7 @@ public:
QString m_currentMessage;
bool m_lastSearchForward;
bool m_findPending;
QString m_lastInsertion;
int anchor() const { return m_anchor; }
@@ -712,6 +714,16 @@ EventResult FakeVimHandler::Private::handleKey(int key, int unmodified,
return EventUnhandled;
}
void FakeVimHandler::Private::stopIncrementalFind()
{
if (m_findPending) {
m_findPending = false;
QTextCursor tc = EDITOR(textCursor());
tc.setPosition(tc.selectionStart());
EDITOR(setTextCursor(tc));
}
}
void FakeVimHandler::Private::setUndoPosition(int pos)
{
//qDebug() << " CURSOR POS: " << m_undoCursorPosition;
@@ -1160,6 +1172,7 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
} else if (key == '/' || key == '?') {
if (hasConfig(ConfigIncSearch)) {
// re-use the core dialog.
m_findPending = true;
m_lastSearchForward = (key == '/');
EDITOR(setTextCursor(m_tc));
emit q->findRequested(!m_lastSearchForward);
@@ -3187,6 +3200,10 @@ bool FakeVimHandler::eventFilter(QObject *ob, QEvent *ev)
return true;
}
if (active && ev->type() == QEvent::FocusIn && ob == d->editor()) {
d->stopIncrementalFind();
}
return QObject::eventFilter(ob, ev);
}