MythGesture: Add a LongClick type

- currently unused
MythTV · Sep 23, 2020 · 8d0aa1a · 8d0aa1a
1 parent af7a9da
commit 8d0aa1a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/mythtv/libs/libmythui/mythgesture.cpp b/mythtv/libs/libmythui/mythgesture.cpp
@@ -57,6 +57,7 @@ MythGestureEvent::MythGestureEvent(Gesture gesture, Button button)
 
 const std::map<QString, MythGestureEvent::Gesture>MythGesture::kSequences =
 {
+    { "1",     MythGestureEvent::LongClick },
     { "5",     MythGestureEvent::Click },
     { "456",   MythGestureEvent::Right },
     { "654",   MythGestureEvent::Left  },
@@ -159,7 +160,7 @@ void MythGesture::Start(void)
  *
  * This method stores the gesture, as it is, and resets all information.
  */
-void MythGesture::Stop(void)
+void MythGesture::Stop(bool Timeout)
 {
     m_lock.lock();
 
@@ -168,7 +169,7 @@ void MythGesture::Stop(void)
         m_recording = false;
 
         // translate before resetting maximums
-        const QString gesture = Translate();
+        const QString gesture = Translate(Timeout);
         auto found = kSequences.find(gesture);
         if (found != kSequences.cend())
             m_lastGesture = found->second;
@@ -213,7 +214,7 @@ static int determineBin (const QPoint & p, int x1, int x2, int y1, int y2)
  *
  * \note The points will be removed during this method.
  */
-QString MythGesture::Translate(void)
+QString MythGesture::Translate(bool Timeout)
 {
     size_t total_points = static_cast<size_t>(m_points.count());
 
@@ -228,6 +229,8 @@ QString MythGesture::Translate(void)
     if (total_points < m_minPoints)
     {
         m_points.clear();
+        if (Timeout)
+            return "1";
         return "5";
     }
 

diff --git a/mythtv/libs/libmythui/mythgesture.h b/mythtv/libs/libmythui/mythgesture.h
@@ -72,6 +72,8 @@ class MUI_PUBLIC MythGestureEvent : public QEvent
         DownThenUp,
 
         /* A click */
+        // NB LongClick before Click as MythMainWindow filters out otherwise
+        LongClick,
         Click
     };
     Q_ENUM(Gesture)
@@ -114,7 +116,7 @@ class MythGesture
                          float BinPercent = 0.07F);
 
     void Start();
-    void Stop();
+    void Stop(bool Timeout = false);
     bool Recording();
     MythGestureEvent* GetGesture() const;
     bool Record(const QPoint& Point);
@@ -123,7 +125,7 @@ class MythGesture
     Q_DISABLE_COPY(MythGesture)
 
     bool    HasMinimumPoints() const;
-    QString Translate();
+    QString Translate(bool Timeout);
     void    AdjustExtremes(int X, int Y);
 
     bool   m_recording    { false };

diff --git a/mythtv/libs/libmythui/mythmainwindow.cpp b/mythtv/libs/libmythui/mythmainwindow.cpp
@@ -1525,7 +1525,7 @@ void MythMainWindow::mouseTimeout(void)
 {
     /* complete the stroke if its our first timeout */
     if (d->m_gesture.Recording())
-        d->m_gesture.Stop();
+        d->m_gesture.Stop(true);
 
     /* get the last gesture */
     MythGestureEvent *e = d->m_gesture.GetGesture();