aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use of QWheelEvent::orientation has been deprecated since Qt 5.15.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2020-07-08 11:44:58 +03:00
parent 158edcc093
commit 233246730c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/vwidgets/vmaingraphicsview.cpp
View File

@ -76,12 +76,12 @@ qreal ScrollingSteps(QWheelEvent* wheel_event)
if (not numPixels.isNull()) if (not numPixels.isNull())
{ {
const qreal mouseScale = settings->GetSensorMouseScale(); const qreal mouseScale = settings->GetSensorMouseScale();
numSteps = (wheel_event->orientation() == Qt::Vertical ? numPixels.y() : numPixels.x()) / mouseScale; numSteps = (numPixels.x() == 0 ? numPixels.y() : numPixels.x()) / mouseScale;
} }
else if (not numDegrees.isNull()) else if (not numDegrees.isNull())
{ {
const qreal mouseScale = settings->GetWheelMouseScale(); const qreal mouseScale = settings->GetWheelMouseScale();
numSteps = (wheel_event->orientation() == Qt::Vertical ? numDegrees.y() : numDegrees.x()) / 15. * mouseScale; numSteps = (numPixels.x() == 0 ? numDegrees.y() : numDegrees.x()) / 15. * mouseScale;
} }
return numSteps; return numSteps;
@ -283,11 +283,12 @@ bool GraphicsViewZoom::eventFilter(QObject *object, QEvent *event)
{ {
if (QWheelEvent* wheel_event = static_cast<QWheelEvent*>(event)) if (QWheelEvent* wheel_event = static_cast<QWheelEvent*>(event))
{ {
if (wheel_event->orientation() == Qt::Vertical) const QPoint numDegrees = wheel_event->angleDelta();
if (numDegrees.x() == 0)
{ {
if (QGuiApplication::keyboardModifiers() == _modifiers) if (QGuiApplication::keyboardModifiers() == _modifiers)
{ {
gentle_zoom(qPow(_zoom_factor_base, wheel_event->angleDelta().y())); gentle_zoom(qPow(_zoom_factor_base, numDegrees.y()));
return true; return true;
} }
else if (QGuiApplication::keyboardModifiers() == Qt::ShiftModifier) else if (QGuiApplication::keyboardModifiers() == Qt::ShiftModifier)