From aab6d7eab1131443f6e67f4280deb76098ad4b41 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Sat, 17 Apr 2021 12:11:14 +0200
Subject: [PATCH] Added slide limit to at most one page on main view

---
 radio/src/gui/colorlcd/view_main.cpp | 49 ++++++++++++++++++++++++++++
 radio/src/gui/colorlcd/view_main.h   |  7 ++++
 2 files changed, 56 insertions(+)

diff --git a/radio/src/gui/colorlcd/view_main.cpp b/radio/src/gui/colorlcd/view_main.cpp
index 81db27952..e65f48c9d 100644
--- a/radio/src/gui/colorlcd/view_main.cpp
+++ b/radio/src/gui/colorlcd/view_main.cpp
@@ -198,6 +198,55 @@ void ViewMain::setScrollPositionY(coord_t value)
   topbar->setTop(getScrollPositionY());
 }
 
+#if defined(HARDWARE_TOUCH)
+
+//#define DEBUG_SLIDE
+
+bool ViewMain::onTouchSlide(coord_t x, coord_t y, coord_t startX, coord_t startY, coord_t slideX, coord_t slideY)
+{
+  // prevent screen sliding over the next one (one screen at a time)
+  if (slidingWindow == this) {
+    if (prevSlideState != touchState.event) {
+      if (touchState.event == TE_SLIDE_END) {
+        startSlidePage = getCurrentMainView();
+#if defined(DEBUG_SLIDE)
+        TRACE("### startSlidePage = %d ###", startSlidePage);
+#endif
+      }
+      prevSlideState = touchState.event;
+    }
+    else if (prevSlideState == TE_SLIDE_END){
+
+      // let's check what would be the next position
+      auto nextPos = (getScrollPositionX() - slideX);
+
+      // if we would get over more than one page counting from slide-start
+      if (abs(nextPos - getMainViewLeftPos(startSlidePage)) > pageWidth) {
+
+#if defined(DEBUG_SLIDE)
+        TRACE("### kill the move ###");
+#endif
+        // kill the movement and let "snap-to-view" finish the job
+        prevSlideState   = TE_NONE;
+        touchState.event = TE_NONE;
+        touchState.lastDeltaX = 0;
+        touchState.lastDeltaY = 0;
+        return true;
+      }
+    }
+  }
+
+#if defined(DEBUG_SLIDE)
+  TRACE("%sWindow[scrollX=%d, scrollY=%d]->onTouchSlide[x=%d, y=%d, startX=%d, startY=%d, slideX=%d, slideY=%d]",
+        touchState.event == TE_SLIDE_END && slidingWindow ? "###" : "",
+        getScrollPositionX(), getScrollPositionY(),
+        x, y, startX, startY, slideX, slideY);
+#endif
+
+  return Window::onTouchSlide(x, y, startX, startY, slideX, slideY);
+}
+#endif
+
 #if defined(HARDWARE_KEYS)
 void ViewMain::onEvent(event_t event)
 {
diff --git a/radio/src/gui/colorlcd/view_main.h b/radio/src/gui/colorlcd/view_main.h
index 07ed08f34..d2515f82f 100644
--- a/radio/src/gui/colorlcd/view_main.h
+++ b/radio/src/gui/colorlcd/view_main.h
@@ -81,6 +81,13 @@ class ViewMain: public Window
     void setScrollPositionX(coord_t value) override;
     void setScrollPositionY(coord_t value) override;
 
+#if defined(HARDWARE_TOUCH)
+    unsigned char prevSlideState = 0;
+    unsigned int  startSlidePage = 0;
+
+    bool onTouchSlide(coord_t x, coord_t y, coord_t startX, coord_t startY, coord_t slideX, coord_t slideY) override;
+#endif
+
 #if defined(HARDWARE_KEYS)
     void onEvent(event_t event) override;
 #endif