Revert "Refactor DEFAULT_MINIMUM_SCALE_DELTA in GestureRecognizer"
This reverts commit a508a8c6db
.
It didn't go through code review process.
This commit is contained in:
parent
7e14716043
commit
91632bd030
2 changed files with 3 additions and 8 deletions
|
@ -316,7 +316,7 @@ void GestureTest::testSetMinimumDelta()
|
|||
|
||||
PinchGesture pinchGesture;
|
||||
QCOMPARE(pinchGesture.isMinimumScaleDeltaRelevant(), false);
|
||||
QCOMPARE(pinchGesture.minimumScaleDelta(), DEFAULT_UNIT_SCALE_DELTA);
|
||||
QCOMPARE(pinchGesture.minimumScaleDelta(), DEFAULT_MINIMUM_SCALE_DELTA);
|
||||
QCOMPARE(pinchGesture.minimumScaleDeltaReached(1.25), true);
|
||||
pinchGesture.setMinimumScaleDelta(.5);
|
||||
QCOMPARE(pinchGesture.isMinimumScaleDeltaRelevant(), true);
|
||||
|
|
|
@ -19,12 +19,7 @@
|
|||
|
||||
namespace KWin
|
||||
{
|
||||
/*
|
||||
* 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%
|
||||
|
||||
static const qreal DEFAULT_MINIMUM_SCALE_DELTA = .2; // 20%
|
||||
class Gesture : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
@ -171,7 +166,7 @@ private:
|
|||
uint m_maximumFingerCount = 0;
|
||||
Direction m_direction = Direction::Expanding;
|
||||
bool m_minimumScaleDeltaRelevant = false;
|
||||
qreal m_minimumScaleDelta = DEFAULT_UNIT_SCALE_DELTA;
|
||||
qreal m_minimumScaleDelta = DEFAULT_MINIMUM_SCALE_DELTA;
|
||||
};
|
||||
|
||||
class KWIN_EXPORT GestureRecognizer : public QObject
|
||||
|
|
Loading…
Reference in a new issue