From 30969b490cdf9bc1c98e3700527ffc62ebb4ba10 Mon Sep 17 00:00:00 2001 From: Friso Smit Date: Sun, 5 Feb 2023 20:46:57 +0100 Subject: [PATCH] Move continuous zoom to a function --- part/pageview.cpp | 19 ++++++++++++------- part/pageview.h | 1 + 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/part/pageview.cpp b/part/pageview.cpp index 93c7c4dbf..0acbab3ab 100644 --- a/part/pageview.cpp +++ b/part/pageview.cpp @@ -2195,6 +2195,17 @@ void PageView::tabletEvent(QTabletEvent *e) } } +void PageView::continuousZoom(double delta) +{ + if (delta) { + d->zoomFactor *= (1.0 + (delta / 500.0)); + d->blockPixmapsRequest = true; + updateZoom(ZoomRefreshCurrent); + d->blockPixmapsRequest = false; + viewport()->update(); + } +} + void PageView::mouseMoveEvent(QMouseEvent *e) { // For some reason in Qt 5.11.2 (no idea when this started) all wheel @@ -2227,13 +2238,7 @@ void PageView::mouseMoveEvent(QMouseEvent *e) } // update zoom level, perform zoom and redraw - if (deltaY) { - d->zoomFactor *= (1.0 + ((double)deltaY / 500.0)); - d->blockPixmapsRequest = true; - updateZoom(ZoomRefreshCurrent); - d->blockPixmapsRequest = false; - viewport()->update(); - } + continuousZoom(deltaY); return; } diff --git a/part/pageview.h b/part/pageview.h index c873cf065..5e5c81857 100644 --- a/part/pageview.h +++ b/part/pageview.h @@ -156,6 +156,7 @@ protected: void paintEvent(QPaintEvent *e) override; void tabletEvent(QTabletEvent *e) override; + void continuousZoom(double delta); void mouseMoveEvent(QMouseEvent *e) override; void mousePressEvent(QMouseEvent *e) override; void mouseReleaseEvent(QMouseEvent *e) override;