Merge remote-tracking branch 'upstream/release/20.08' into master

This commit is contained in:
Oliver Sander 2020-09-11 11:38:58 +02:00
commit 112b6a10cd

View file

@ -4742,9 +4742,6 @@ void PageView::slotAutoScrollDown()
void PageView::slotScrollUp(int nSteps)
{
if (d->scroller->state() == QScroller::Scrolling)
return;
// if in single page mode and at the top of the screen, go to \ page
if (Okular::Settings::viewContinuous() || verticalScrollBar()->value() > verticalScrollBar()->minimum()) {
if (nSteps) {
@ -4767,9 +4764,6 @@ void PageView::slotScrollUp(int nSteps)
void PageView::slotScrollDown(int nSteps)
{
if (d->scroller->state() == QScroller::Scrolling)
return;
// if in single page mode and at the bottom of the screen, go to next page
if (Okular::Settings::viewContinuous() || verticalScrollBar()->value() < verticalScrollBar()->maximum()) {
if (nSteps) {