From 740318df9022f27ec07eb77f2d01fda802ce4018 Mon Sep 17 00:00:00 2001 From: Kishore Gopalakrishnan Date: Sun, 27 Sep 2020 11:40:29 +0530 Subject: [PATCH] Re-add support for pageup/pagedown overlap. --- ui/pageview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/pageview.cpp b/ui/pageview.cpp index 89daf92f3..2525d3398 100644 --- a/ui/pageview.cpp +++ b/ui/pageview.cpp @@ -4739,7 +4739,7 @@ void PageView::slotScrollUp(int nSteps) d->scroller->scrollTo(d->scroller->finalPosition() + QPoint(0, -100 * nSteps), 100); } else { if (d->scroller->finalPosition().y() > verticalScrollBar()->minimum()) - d->scroller->scrollTo(d->scroller->finalPosition() + QPoint(0, -verticalScrollBar()->rect().height())); + d->scroller->scrollTo(d->scroller->finalPosition() + QPoint(0, -(1 - Okular::Settings::scrollOverlap() / 100.0) * verticalScrollBar()->rect().height())); } } else if (d->document->currentPage() > 0) { // more optimized than document->setPrevPage and then move view to bottom @@ -4761,7 +4761,7 @@ void PageView::slotScrollDown(int nSteps) d->scroller->scrollTo(d->scroller->finalPosition() + QPoint(0, 100 * nSteps), 100); } else { if (d->scroller->finalPosition().y() < verticalScrollBar()->maximum()) - d->scroller->scrollTo(d->scroller->finalPosition() + QPoint(0, verticalScrollBar()->rect().height())); + d->scroller->scrollTo(d->scroller->finalPosition() + QPoint(0, (1 - Okular::Settings::scrollOverlap() / 100.0) * verticalScrollBar()->rect().height())); } } else if ((int)d->document->currentPage() < d->items.count() - 1) { // more optimized than document->setNextPage and then move view to top