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

Merge remote-tracking branch 'origin/3.0'

Browse Source
This commit is contained in:
Eike Ziller
2013-10-29 08:17:05 +01:00
parent cd041f3f93 b926435576
commit 242b7bd209
155 changed files with 3464 additions and 2565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1576,7 +1576,6 @@ public:
QTextBlock previousLine(const QTextBlock &block) const; // previous line (respects wrapped parts)
int linesOnScreen() const;
int columnsOnScreen() const;
int linesInDocument() const;
// The following use all zero-based counting.
@@ -3673,9 +3672,12 @@ bool FakeVimHandler::Private::handleMovement(const Input &input)
setCursorPosition(&m_cursor, pos);
handleStartOfLine();
} else if (g.gflag && input.is('m')) {
moveToStartOfLine();
moveRight(qMin(columnsOnScreen() / 2, rightDist()) - 1);
setTargetColumn();
const QPoint pos(EDITOR(viewport()->width()) / 2, EDITOR(cursorRect(m_cursor)).y());
QTextCursor tc = EDITOR(cursorForPosition(pos));
if (!tc.isNull()) {
m_cursor = tc;
setTargetColumn();
}
} else if (input.is('M')) {
m_cursor = EDITOR(cursorForPosition(QPoint(0, EDITOR(height()) / 2)));
handleStartOfLine();
@@ -5397,7 +5399,7 @@ bool FakeVimHandler::Private::handleExSetCommand(const ExCommand &cmd)
if (!error.isEmpty())
showMessage(MessageError, error);
} else {
showMessage(MessageError, FakeVimHandler::tr("Unknown option: ") + cmd.args);
showMessage(MessageError, FakeVimHandler::tr("Unknown option:") + QLatin1Char(' ') + cmd.args);
}
updateMiniBuffer();
updateEditor();
@@ -6370,25 +6372,16 @@ int FakeVimHandler::Private::cursorLineOnScreen() const
{
if (!editor())
return 0;
QRect rect = EDITOR(cursorRect());
return rect.y() / rect.height();
const QRect rect = EDITOR(cursorRect(m_cursor));
return rect.height() > 0 ? rect.y() / rect.height() : 0;
}
int FakeVimHandler::Private::linesOnScreen() const
{
if (!editor())
return 1;
QRect rect = EDITOR(cursorRect());
return EDITOR(viewport()->height()) / rect.height();
}
int FakeVimHandler::Private::columnsOnScreen() const
{
if (!editor())
return 1;
QRect rect = EDITOR(cursorRect());
// qDebug() << "WID: " << EDITOR(width()) << "RECT: " << rect;
return EDITOR(viewport()->width()) / rect.width();
const int h = EDITOR(cursorRect(m_cursor)).height();
return h > 0 ? EDITOR(viewport()->height()) / h : 1;
}
int FakeVimHandler::Private::cursorLine() const