diff --git a/toonz/sources/toonz/sceneviewerevents.cpp b/toonz/sources/toonz/sceneviewerevents.cpp index 20f1304..e6d82b6 100644 --- a/toonz/sources/toonz/sceneviewerevents.cpp +++ b/toonz/sources/toonz/sceneviewerevents.cpp @@ -893,12 +893,9 @@ void SceneViewer::gestureEvent(QGestureEvent *e) { if (QGesture *pinch = e->gesture(Qt::PinchGesture)) { QPinchGesture *gesture = static_cast(pinch); QPinchGesture::ChangeFlags changeFlags = gesture->changeFlags(); - -#ifdef _WIN32 - QPoint firstCenter = mapFromGlobal(gesture->centerPoint().toPoint()); -#else - QPoint firstCenter = gesture->centerPoint().toPoint(); -#endif + QPoint firstCenter = gesture->centerPoint().toPoint(); + if (m_touchDevice == QTouchDevice::TouchScreen) + firstCenter = mapFromGlobal(firstCenter); if (gesture->state() == Qt::GestureStarted) { m_gestureActive = true; diff --git a/toonz/sources/toonzqt/schematicviewer.cpp b/toonz/sources/toonzqt/schematicviewer.cpp index 2bf1cf8..ca64d96 100644 --- a/toonz/sources/toonzqt/schematicviewer.cpp +++ b/toonz/sources/toonzqt/schematicviewer.cpp @@ -590,12 +590,9 @@ void SchematicSceneViewer::gestureEvent(QGestureEvent *e) { if (QGesture *pinch = e->gesture(Qt::PinchGesture)) { QPinchGesture *gesture = static_cast(pinch); QPinchGesture::ChangeFlags changeFlags = gesture->changeFlags(); - -#ifdef _WIN32 - QPoint firstCenter = mapFromGlobal(gesture->centerPoint().toPoint()); -#else - QPoint firstCenter = gesture->centerPoint().toPoint(); -#endif + QPoint firstCenter = gesture->centerPoint().toPoint(); + if (m_touchDevice == QTouchDevice::TouchScreen) + firstCenter = mapFromGlobal(firstCenter); if (gesture->state() == Qt::GestureStarted) { m_gestureActive = true;