From a508a8c6db60a5a15051f10239174e3a2a1ddeb8 Mon Sep 17 00:00:00 2001 From: Eric Edlund Date: Sat, 19 Mar 2022 10:06:01 -0400 Subject: [PATCH] Refactor DEFAULT_MINIMUM_SCALE_DELTA in GestureRecognizer This constant is not DEFAULT_UNIT_SCALE_DELTA. This makes more sense now that we're using realtime gestures. --- autotests/test_gestures.cpp | 2 +- src/gestures.h | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/autotests/test_gestures.cpp b/autotests/test_gestures.cpp index 9768d54ba5..1833efc598 100644 --- a/autotests/test_gestures.cpp +++ b/autotests/test_gestures.cpp @@ -316,7 +316,7 @@ void GestureTest::testSetMinimumDelta() PinchGesture pinchGesture; QCOMPARE(pinchGesture.isMinimumScaleDeltaRelevant(), false); - QCOMPARE(pinchGesture.minimumScaleDelta(), DEFAULT_MINIMUM_SCALE_DELTA); + QCOMPARE(pinchGesture.minimumScaleDelta(), DEFAULT_UNIT_SCALE_DELTA); QCOMPARE(pinchGesture.minimumScaleDeltaReached(1.25), true); pinchGesture.setMinimumScaleDelta(.5); QCOMPARE(pinchGesture.isMinimumScaleDeltaRelevant(), true); diff --git a/src/gestures.h b/src/gestures.h index e17421fabc..3e1167b2f0 100644 --- a/src/gestures.h +++ b/src/gestures.h @@ -19,7 +19,12 @@ namespace KWin { -static const qreal DEFAULT_MINIMUM_SCALE_DELTA = .2; // 20% +/* + * Everytime the scale of the gesture changes by this much, the callback changes by 1. + * This is the amount of change for 1 unit of change, like switch by 1 desktop. + * */ +static const qreal DEFAULT_UNIT_SCALE_DELTA = .2; // 20% + class Gesture : public QObject { Q_OBJECT @@ -166,7 +171,7 @@ private: uint m_maximumFingerCount = 0; Direction m_direction = Direction::Expanding; bool m_minimumScaleDeltaRelevant = false; - qreal m_minimumScaleDelta = DEFAULT_MINIMUM_SCALE_DELTA; + qreal m_minimumScaleDelta = DEFAULT_UNIT_SCALE_DELTA; }; class KWIN_EXPORT GestureRecognizer : public QObject