Commit 634182d4 authored by Eric Edlund's avatar Eric Edlund
Browse files

Move gesture direction to base class

parent d29c7a6c
......@@ -19,10 +19,8 @@ class GestureTest : public QObject
{
Q_OBJECT
private Q_SLOTS:
void testSwipeDirection_data();
void testSwipeDirection();
void testPinchDirection_data();
void testPinchDirection();
void testDirection_data();
void testDirection();
// swipe only
void testMinimumX_data();
......@@ -54,48 +52,30 @@ private Q_SLOTS:
void testSwipeGeometryStart();
};
void GestureTest::testSwipeDirection_data()
void GestureTest::testDirection_data()
{
QTest::addColumn<GestureDirection>("swipe_direction");
QTest::addColumn<GestureDirection>("direction");
QTest::newRow("Up") << GestureDirection::Up;
QTest::newRow("Left") << GestureDirection::Left;
QTest::newRow("Right") << GestureDirection::Right;
QTest::newRow("Down") << GestureDirection::Down;
QTest::newRow("Contracting") << GestureDirection::Contracting;
QTest::newRow("Expanding") << GestureDirection::Expanding;
}
void GestureTest::testSwipeDirection()
void GestureTest::testDirection()
{
SwipeGesture gesture;
QCOMPARE(gesture.direction(), GestureDirection::Down);
QFETCH(GestureDirection, swipe_direction);
gesture.setDirection(swipe_direction);
QCOMPARE(gesture.direction(), swipe_direction);
QCOMPARE(gesture.direction(), 0);
QFETCH(GestureDirection, direction);
gesture.setDirection(direction);
QCOMPARE(gesture.direction(), direction);
// back to down
gesture.setDirection(GestureDirection::Down);
QCOMPARE(gesture.direction(), GestureDirection::Down);
}
void GestureTest::testPinchDirection_data()
{
QTest::addColumn<GestureDirection>("pinch_direction");
QTest::newRow("Contracting") << GestureDirection::Contracting;
QTest::newRow("Expanding") << GestureDirection::Expanding;
}
void GestureTest::testPinchDirection()
{
PinchGesture gesture;
QCOMPARE(gesture.direction(), GestureDirection::Expanding);
QFETCH(GestureDirection, pinch_direction);
gesture.setDirection(pinch_direction);
QCOMPARE(gesture.direction(), pinch_direction);
// back to down
gesture.setDirection(GestureDirection::Expanding);
QCOMPARE(gesture.direction(), GestureDirection::Expanding);
}
void GestureTest::testMinimumX_data()
{
QTest::addColumn<int>("min");
......
......@@ -367,16 +367,6 @@ void GestureRecognizer::endPinchGesture() // because fingers up
m_currentSwipeAxis = Axis::None;
}
GestureDirections SwipeGesture::direction() const
{
return m_direction;
}
void SwipeGesture::setDirection(GestureDirections direction)
{
m_direction = direction;
}
void SwipeGesture::setMinimumX(int x)
{
m_minimumX = x;
......@@ -457,16 +447,6 @@ bool SwipeGesture::isMinimumDeltaRelevant() const
return m_minimumDeltaRelevant;
}
GestureDirections PinchGesture::direction() const
{
return m_direction;
}
void PinchGesture::setDirection(GestureDirections direction)
{
m_direction = direction;
}
qreal PinchGesture::minimumScaleDelta() const
{
return m_minimumScaleDelta;
......@@ -510,4 +490,14 @@ QSet<uint> Gesture::acceptableFingerCounts() const
{
return m_validFingerCounts;
}
GestureDirections Gesture::direction() const
{
return m_direction;
}
void Gesture::setDirection(GestureDirections direction)
{
m_direction = direction;
}
}
......@@ -50,8 +50,12 @@ public:
bool isFingerCountAcceptable(uint fingers) const;
QSet<uint> acceptableFingerCounts() const;
GestureDirections direction() const;
void setDirection(GestureDirections direction);
protected:
explicit Gesture(QObject *parent);
GestureDirections m_direction;
Q_SIGNALS:
/**
......@@ -80,9 +84,6 @@ public:
explicit SwipeGesture(QObject *parent = nullptr);
~SwipeGesture() override;
GestureDirections direction() const;
void setDirection(GestureDirections direction);
void setMinimumX(int x);
int minimumX() const;
bool minimumXIsRelevant() const;
......@@ -118,7 +119,6 @@ Q_SIGNALS:
void deltaProgress(const QSizeF &delta);
private:
GestureDirections m_direction = GestureDirection::Down;
bool m_minimumXRelevant = false;
int m_minimumX = 0;
bool m_minimumYRelevant = false;
......@@ -138,9 +138,6 @@ public:
explicit PinchGesture(QObject *parent = nullptr);
~PinchGesture() override;
GestureDirections direction() const;
void setDirection(GestureDirections direction);
qreal minimumScaleDelta() const;
/**
......@@ -161,7 +158,6 @@ Q_SIGNALS:
void progress(qreal);
private:
GestureDirections m_direction = GestureDirection::Expanding;
bool m_minimumScaleDeltaRelevant = false;
qreal m_minimumScaleDelta = DEFAULT_UNIT_SCALE_DELTA;
};
......
......@@ -128,7 +128,6 @@ void GlobalShortcutsManager::registerGesture(GestureDeviceType device, GestureDi
if (isSwipeDirection(direction)) {
std::unique_ptr<SwipeGesture> gesture = std::make_unique<SwipeGesture>();
gesture->addFingerCount(fingerCount);
gesture->setDirection(direction);
gesture->setMinimumDelta(QSizeF(200, 200));
connect(gesture.get(), &SwipeGesture::progress, progressCallback);
connect(gesture.get(), &Gesture::triggered, onUp, &QAction::trigger, Qt::QueuedConnection);
......@@ -137,12 +136,12 @@ void GlobalShortcutsManager::registerGesture(GestureDeviceType device, GestureDi
} else if (isPinchDirection(direction)) {
std::unique_ptr<PinchGesture> gesture = std::make_unique<PinchGesture>();
gesture->addFingerCount(fingerCount);
gesture->setDirection(direction);
connect(gesture.get(), &PinchGesture::progress, progressCallback);
connect(gesture.get(), &Gesture::triggered, onUp, &QAction::trigger, Qt::QueuedConnection);
connect(gesture.get(), &Gesture::cancelled, onUp, &QAction::trigger, Qt::QueuedConnection);
shortcut.pinchGesture = std::move(gesture);
}
shortcut.gesture()->setDirection(direction);
addIfNotExists(GlobalShortcut(std::move(shortcut), onUp), device);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment