3 files changed, 41 insertions, 9 deletions

diff --git a/src/plugins/fakevim/fakevimactions.cpp b/src/plugins/fakevim/fakevimactions.cpp
index 741147559e..6b7029e757 100644
--- a/src/plugins/fakevim/fakevimactions.cpp
+++ b/src/plugins/fakevim/fakevimactions.cpp
@@ -195,6 +195,7 @@ FakeVimSettings *theFakeVimSettings()
     createAction(s, ConfigSmartCase,      false, _("SmartCase"),     _("scs"));
     createAction(s, ConfigWrapScan,       true,  _("WrapScan"),      _("ws"));
     createAction(s, ConfigShowCmd,        true,  _("ShowCmd"),       _("sc"));
+    createAction(s, ConfigScrollOff,      0,     _("ScrollOff"),     _("so"));
     createAction(s, ConfigBackspace,      _("indent,eol,start"), _("ConfigBackspace"), _("bs"));
     createAction(s, ConfigIsKeyword,      _("@,48-57,_,192-255,a-z,A-Z"), _("IsKeyword"), _("isk"));
     createAction(s, ConfigClipboard,      QString(), _("Clipboard"), _("cb"));
diff --git a/src/plugins/fakevim/fakevimactions.h b/src/plugins/fakevim/fakevimactions.h
index a3c8133aa9..0bcf9e8c05 100644
--- a/src/plugins/fakevim/fakevimactions.h
+++ b/src/plugins/fakevim/fakevimactions.h
@@ -90,7 +90,8 @@ enum FakeVimSettingsCode
     ConfigShowMarks,
     ConfigPassControlKey,
     ConfigClipboard,
-    ConfigShowCmd
+    ConfigShowCmd,
+    ConfigScrollOff
 };
 
 class FakeVimSettings : public QObject
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index 81c84a450e..f706a67646 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -1492,9 +1492,11 @@ public:
     int logicalToPhysicalColumn(int logical, const QString &text) const;
     Column cursorColumn() const; // as visible on screen
     int firstVisibleLine() const;
+    void setScrollBarValue(int line);
     void scrollToLine(int line);
     void scrollUp(int count);
     void scrollDown(int count) { scrollUp(-count); }
+    void updateScrollOffset();
     void alignViewportToCursor(Qt::AlignmentFlag align, int line = -1,
         bool moveToNonBlank = false);
 
@@ -2564,6 +2566,8 @@ void FakeVimHandler::Private::moveDown(int n)
         block = document()->lastBlock();
     setPosition(block.position() + qMax(0, qMin(block.length() - 2, col)));
     moveToTargetColumn();
+
+    updateScrollOffset();
 }
 
 bool FakeVimHandler::Private::moveToNextParagraph(int count)
@@ -3334,13 +3338,13 @@ bool FakeVimHandler::Private::handleMovement(const Input &input)
     } else if (input.is(']')) {
         m_subsubmode = CloseSquareSubSubMode;
     } else if (input.isKey(Key_PageDown) || input.isControl('f')) {
-        moveDown(count * (linesOnScreen() - 2) - cursorLineOnScreen());
+        moveDown(count * (linesOnScreen() - 2));
         scrollToLine(cursorLine());
         handleStartOfLine();
         movement = _("f");
     } else if (input.isKey(Key_PageUp) || input.isControl('b')) {
-        moveUp(count * (linesOnScreen() - 2) + cursorLineOnScreen());
-        scrollToLine(cursorLine() + linesOnScreen() - 2);
+        moveUp(count * (linesOnScreen() - 2));
+        scrollToLine(qMax(0, cursorLine() - linesOnScreen()));
         handleStartOfLine();
         movement = _("b");
     } else if (input.isKey(Key_BracketLeft) || input.isKey(Key_BracketRight)) {
@@ -5994,13 +5998,22 @@ int FakeVimHandler::Private::linesInDocument() const
     return document()->lastBlock().length() <= 1 ? count - 1 : count;
 }
 
-void FakeVimHandler::Private::scrollToLine(int line)
+void FakeVimHandler::Private::setScrollBarValue(int line)
 {
-    // FIXME: works only for QPlainTextEdit
     QScrollBar *scrollBar = EDITOR(verticalScrollBar());
-    //qDebug() << "SCROLL: " << scrollBar->value() << line;
-    scrollBar->setValue(line);
-    //QTC_CHECK(firstVisibleLine() == line);
+
+    // Convert line number to scroll bar value.
+    const int maxValue = scrollBar->maximum();
+    const int scrollLines = qMax(1, linesInDocument() - linesOnScreen());
+    const int value = maxValue >= scrollLines ? line * maxValue / scrollLines : line;
+
+    scrollBar->setValue(value);
+}
+
+void FakeVimHandler::Private::scrollToLine(int line)
+{
+    setScrollBarValue(line);
+    updateScrollOffset();
 }
 
 int FakeVimHandler::Private::firstVisibleLine() const
@@ -6020,6 +6033,23 @@ void FakeVimHandler::Private::scrollUp(int count)
     scrollToLine(cursorLine() - cursorLineOnScreen() - count);
 }
 
+void FakeVimHandler::Private::updateScrollOffset()
+{
+    // Precision of scroll offset depends on singleStep property of vertical scroll bar.
+    const int screenLines = linesOnScreen();
+    const int offset = qMin(theFakeVimSetting(ConfigScrollOff)->value().toInt(), screenLines / 2);
+    const int line = cursorLine();
+    const int scrollLine = firstVisibleLine();
+    int d = line - scrollLine;
+    if (d < offset) {
+        setScrollBarValue(scrollLine - offset + d);
+    } else {
+        d = screenLines - d;
+        if (d <= offset)
+            setScrollBarValue(scrollLine + offset - d);
+    }
+}
+
 void FakeVimHandler::Private::alignViewportToCursor(AlignmentFlag align, int line,
     bool moveToNonBlank)
 {