From 03dc971a4b9b3f935c5737310c4b6af9ebb7e5b8 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sat, 23 Jan 2021 08:18:18 +1100 Subject: [PATCH] nodeview: use existing zoom check function --- app/widget/nodeview/nodeview.cpp | 4 ++-- app/widget/timebased/timebasedview.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/widget/nodeview/nodeview.cpp b/app/widget/nodeview/nodeview.cpp index e531082d6..6f91ac6b0 100644 --- a/app/widget/nodeview/nodeview.cpp +++ b/app/widget/nodeview/nodeview.cpp @@ -28,6 +28,7 @@ #include "nodeviewundo.h" #include "node/factory.h" #include "widget/menu/menushared.h" +#include "widget/timebased/timebasedview.h" #define super HandMovableView @@ -558,8 +559,7 @@ void NodeView::mouseReleaseEvent(QMouseEvent *event) void NodeView::wheelEvent(QWheelEvent *event) { - if (event->modifiers() & Qt::ControlModifier) { - // FIXME: Hardcoded divider (0.001) + if (TimeBasedView::WheelEventIsAZoomEvent(event)) { qreal multiplier = 1.0 + (static_cast(event->angleDelta().x() + event->angleDelta().y()) * 0.001); double test_scale = scale_ * multiplier; diff --git a/app/widget/timebased/timebasedview.h b/app/widget/timebased/timebasedview.h index 695d3d24e..2aa646719 100644 --- a/app/widget/timebased/timebasedview.h +++ b/app/widget/timebased/timebasedview.h @@ -50,6 +50,8 @@ public: const double& GetYScale() const; void SetYScale(const double& y_scale); + static bool WheelEventIsAZoomEvent(QWheelEvent* event); + public slots: void SetTime(const int64_t time); @@ -73,8 +75,6 @@ protected: bool HandleZoomFromScroll(QWheelEvent* event); - bool WheelEventIsAZoomEvent(QWheelEvent* event); - rational GetPlayheadTime() const; bool PlayheadPress(QMouseEvent* event);