libgestures/gesturerecognizer/holdGestureBegin: do nothing if has act…

…ive gestures, add test
taj-ny · Oct 16, 2024 · 60ccb92 · 60ccb92
1 parent 803f2b0
commit 60ccb92
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 0 deletions.
diff --git a/src/libgestures/gestures/gesturerecognizer.cpp b/src/libgestures/gestures/gesturerecognizer.cpp
@@ -12,6 +12,9 @@ void GestureRecognizer::unregisterGestures()
 
 void GestureRecognizer::holdGestureBegin(const uint8_t &fingerCount)
 {
+    if (!m_activeHoldGestures.empty())
+        return;
+
     for (std::shared_ptr<Gesture> gesture : m_gestures)
     {
         std::shared_ptr<HoldGesture> holdGesture = std::dynamic_pointer_cast<HoldGesture>(gesture);

diff --git a/tests/libgestures/gestures/test_gesturerecognizer_hold.cpp b/tests/libgestures/gestures/test_gesturerecognizer_hold.cpp
@@ -14,6 +14,23 @@ void TestGestureRecognizerHold::init()
     m_hold2_2actions_trigger1only->addAction(std::make_shared<GestureAction>(0));
 }
 
+void TestGestureRecognizerHold::holdGestureBegin_calledTwice_hasOneActiveGesture()
+{
+    TestGestureRecognizerShared::gestureBegin_calledTwice_hasOneActiveGesture
+    (
+        m_gestureRecognizer,
+        m_hold2,
+        [this]()
+        {
+            m_gestureRecognizer->holdGestureBegin(2);
+        },
+        [this]()
+        {
+            return m_gestureRecognizer->m_activeHoldGestures;
+        }
+    );
+}
+
 void TestGestureRecognizerHold::holdGestureBegin_gestureConditionsNotSatisfied_hasNoActiveGestures()
 {
     TestGestureRecognizerShared::gestureBegin_gestureConditionsNotSatisfied_hasNoActiveGestures

diff --git a/tests/libgestures/gestures/test_gesturerecognizer_hold.h b/tests/libgestures/gestures/test_gesturerecognizer_hold.h
@@ -7,6 +7,7 @@ class TestGestureRecognizerHold : public QObject
 private slots:
     void init();
 
+    void holdGestureBegin_calledTwice_hasOneActiveGesture();
     void holdGestureBegin_gestureConditionsNotSatisfied_hasNoActiveGestures();
     void holdGestureBegin_twoGesturesWithSatisfiedConditions_hasTwoActiveGestures();
 

diff --git a/tests/libgestures/gestures/test_gesturerecognizer_shared.cpp b/tests/libgestures/gestures/test_gesturerecognizer_shared.cpp
@@ -20,6 +20,22 @@ template void TestGestureRecognizerShared::gestureUpdate_activeGesture_gestureUp
     const QPointF &delta
 );
 
+void TestGestureRecognizerShared::gestureBegin_calledTwice_hasOneActiveGesture
+(
+    std::shared_ptr<GestureRecognizer> gestureRecognizer,
+    std::shared_ptr<Gesture> gesture,
+    std::function<void()> gestureBegin,
+    std::function<QList<std::shared_ptr<Gesture>>(void)> activeGestures
+)
+{
+    gestureRecognizer->registerGesture(gesture);
+
+    gestureBegin();
+    gestureBegin();
+
+    QCOMPARE(activeGestures().size(), 1);
+}
+
 void TestGestureRecognizerShared::gestureBegin_gestureConditionsNotSatisfied_hasNoActiveGestures
 (
     std::shared_ptr<GestureRecognizer> gestureRecognizer,

diff --git a/tests/libgestures/gestures/test_gesturerecognizer_shared.h b/tests/libgestures/gestures/test_gesturerecognizer_shared.h
@@ -5,6 +5,13 @@
 class TestGestureRecognizerShared
 {
 public:
+    static void gestureBegin_calledTwice_hasOneActiveGesture
+    (
+        std::shared_ptr<GestureRecognizer> gestureRecognizer,
+        std::shared_ptr<Gesture> gesture,
+        std::function<void()> gestureBegin,
+        std::function<QList<std::shared_ptr<Gesture>>(void)> activeGestures
+    );
     static void gestureBegin_gestureConditionsNotSatisfied_hasNoActiveGestures
     (
         std::shared_ptr<GestureRecognizer> gestureRecognizer,