From 825e661408059c088d7a664b9f0888107f023991 Mon Sep 17 00:00:00 2001
From: Gabriel Studer <gabriel.studer@unibas.ch>
Date: Mon, 22 Aug 2022 11:11:41 +0200
Subject: [PATCH] silence QWheelEvent deprecation warning - delta() =>
angleDelta().y()
angleDelta() returns QPoint as opposed to int from delta() as it
differentiates between vertical and horizontal mouse wheel.
To reproduce the classic Zoom behaviour, we're accessing the
horizontal wheel => y()
---
modules/gui/src/data_viewer/data_viewer_panel_base.cc | 2 +-
modules/gui/src/gl_canvas.cc | 2 +-
modules/gui/src/sequence_viewer/sequence_viewer.cc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/gui/src/data_viewer/data_viewer_panel_base.cc b/modules/gui/src/data_viewer/data_viewer_panel_base.cc
index 68077d89a..e28fb0856 100644
--- a/modules/gui/src/data_viewer/data_viewer_panel_base.cc
+++ b/modules/gui/src/data_viewer/data_viewer_panel_base.cc
@@ -610,7 +610,7 @@ void DataViewerPanelBase::mouseMoveEvent(QMouseEvent* event)
void DataViewerPanelBase::wheelEvent(QWheelEvent* event)
{
if(!IsDataValid()) return;
- if(event->delta()>0) {
+ if(event->angleDelta().y()>0) {
zoom(-1);
} else {
zoom(1);
diff --git a/modules/gui/src/gl_canvas.cc b/modules/gui/src/gl_canvas.cc
index 372e344c3..fff233acc 100644
--- a/modules/gui/src/gl_canvas.cc
+++ b/modules/gui/src/gl_canvas.cc
@@ -485,7 +485,7 @@ void GLCanvas::keyReleaseEvent(QKeyEvent* event) {
void GLCanvas::wheelEvent(QWheelEvent* event) {
OnTransform(gfx::INPUT_COMMAND_TRANSZ,0,gfx::TRANSFORM_VIEW,
- 0.2*static_cast<Real>(-event->delta()));
+ 0.2*static_cast<Real>(-event->angleDelta().y()));
}
bool GLCanvas::event(QEvent* event) {
diff --git a/modules/gui/src/sequence_viewer/sequence_viewer.cc b/modules/gui/src/sequence_viewer/sequence_viewer.cc
index b04299a13..67337d411 100644
--- a/modules/gui/src/sequence_viewer/sequence_viewer.cc
+++ b/modules/gui/src/sequence_viewer/sequence_viewer.cc
@@ -295,7 +295,7 @@ void SequenceViewer::FitToContents()
void SequenceViewer::MouseWheelEvent(QWheelEvent* event)
{
- int delta = event->delta();
+ int delta = event->angleDelta().y();
if (event->orientation() == Qt::Vertical) {
if(delta>0){
model_->ZoomIn();
--
GitLab