From 740eab502543089c5a2ed15b5538f0c03ffee852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Fri, 1 Oct 2021 20:07:14 +0200 Subject: [PATCH] Update QWheelEvent delta usage --- YACReader/goto_flow.cpp | 2 +- YACReader/magnifying_glass.cpp | 8 ++++---- YACReader/viewer.cpp | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/YACReader/goto_flow.cpp b/YACReader/goto_flow.cpp index 89b3ff6b..615204df 100644 --- a/YACReader/goto_flow.cpp +++ b/YACReader/goto_flow.cpp @@ -195,7 +195,7 @@ void GoToFlow::updateImageData() void GoToFlow::wheelEvent(QWheelEvent *event) { - if (event->delta() < 0) + if (event->pixelDelta().y() < 0) flow->showNext(); else flow->showPrevious(); diff --git a/YACReader/magnifying_glass.cpp b/YACReader/magnifying_glass.cpp index 49e3dab4..cccd028a 100644 --- a/YACReader/magnifying_glass.cpp +++ b/YACReader/magnifying_glass.cpp @@ -144,28 +144,28 @@ void MagnifyingGlass::wheelEvent(QWheelEvent *event) switch (event->modifiers()) { // size case Qt::NoModifier: - if (event->delta() < 0) + if (event->pixelDelta().y() < 0) sizeUp(); else sizeDown(); break; // size height case Qt::ControlModifier: - if (event->delta() < 0) + if (event->pixelDelta().y() < 0) heightUp(); else heightDown(); break; // size width case Qt::AltModifier: - if (event->delta() < 0) + if (event->pixelDelta().y() < 0) widthUp(); else widthDown(); break; // zoom level case Qt::ShiftModifier: - if (event->delta() < 0) + if (event->pixelDelta().y() < 0) zoomIn(); else zoomOut(); diff --git a/YACReader/viewer.cpp b/YACReader/viewer.cpp index 6f2ee1fa..029f306f 100644 --- a/YACReader/viewer.cpp +++ b/YACReader/viewer.cpp @@ -689,12 +689,12 @@ static void animateScroll(QPropertyAnimation &scroller, const QScrollBar &scroll void Viewer::wheelEvent(QWheelEvent *event) { if (render->hasLoadedComic()) { - if (event->orientation() == Qt::Horizontal) { - animateScroll(*horizontalScroller, *horizontalScrollBar(), event->delta()); + if (event->pixelDelta().x() != 0) { + animateScroll(*horizontalScroller, *horizontalScrollBar(), event->pixelDelta().x()); return; } - if ((event->delta() < 0) && (verticalScrollBar()->sliderPosition() == verticalScrollBar()->maximum())) { + if ((event->pixelDelta().y() < 0) && (verticalScrollBar()->sliderPosition() == verticalScrollBar()->maximum())) { if (wheelStop || verticalScrollBar()->maximum() == verticalScrollBar()->minimum()) { if (getMovement(event) == Forward) { next(); @@ -706,7 +706,7 @@ void Viewer::wheelEvent(QWheelEvent *event) } else wheelStop = true; } else { - if ((event->delta() > 0) && (verticalScrollBar()->sliderPosition() == verticalScrollBar()->minimum())) { + if ((event->pixelDelta().y() > 0) && (verticalScrollBar()->sliderPosition() == verticalScrollBar()->minimum())) { if (wheelStop || verticalScrollBar()->maximum() == verticalScrollBar()->minimum()) { if (getMovement(event) == Backward) { prev(); @@ -720,7 +720,7 @@ void Viewer::wheelEvent(QWheelEvent *event) } } - animateScroll(*verticalScroller, *verticalScrollBar(), event->delta()); + animateScroll(*verticalScroller, *verticalScrollBar(), event->pixelDelta().y()); } }