From 8ed6ffaaf8d0ad681c4f84b89e4a72792edb5a8f Mon Sep 17 00:00:00 2001
From: JF <jf@codingfield.com>
Date: Sun, 15 Mar 2020 21:01:24 +0100
Subject: Add the possibility to the screen to handle a touch gesture. A
 default action is taken if the current screen doesn't handle it.

---
 src/DisplayApp/DisplayApp.cpp | 45 ++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

(limited to 'src/DisplayApp/DisplayApp.cpp')

diff --git a/src/DisplayApp/DisplayApp.cpp b/src/DisplayApp/DisplayApp.cpp
index 3f58e4b3..14545d2e 100644
--- a/src/DisplayApp/DisplayApp.cpp
+++ b/src/DisplayApp/DisplayApp.cpp
@@ -110,17 +110,19 @@ void DisplayApp::Refresh() {
       case Messages::TouchEvent: {
         if (state != States::Running) break;
         auto gesture = OnTouchEvent();
-        switch (gesture) {
-          case DisplayApp::TouchEvents::SwipeUp:
-            currentScreen->OnButtonPushed();
-            lvgl.SetFullRefresh(Components::LittleVgl::FullRefreshDirections::Up);
-            break;
-          case DisplayApp::TouchEvents::SwipeDown:
-            currentScreen->OnButtonPushed();
-            lvgl.SetFullRefresh(Components::LittleVgl::FullRefreshDirections::Down);
-            break;
-          default:
-            break;
+        if(!currentScreen->OnTouchEvent(gesture)) {
+          switch (gesture) {
+            case TouchEvents::SwipeUp:
+              currentScreen->OnButtonPushed();
+              lvgl.SetFullRefresh(Components::LittleVgl::FullRefreshDirections::Up);
+              break;
+            case TouchEvents::SwipeDown:
+              currentScreen->OnButtonPushed();
+              lvgl.SetFullRefresh(Components::LittleVgl::FullRefreshDirections::Down);
+              break;
+            default:
+              break;
+          }
         }
       }
         break;
@@ -189,32 +191,31 @@ void DisplayApp::PushMessage(DisplayApp::Messages msg) {
   }
 }
 
-DisplayApp::TouchEvents DisplayApp::OnTouchEvent() {
+TouchEvents DisplayApp::OnTouchEvent() {
   auto info = touchPanel.GetTouchInfo();
   if(info.isTouch) {
     switch(info.gesture) {
       case Pinetime::Drivers::Cst816S::Gestures::SingleTap:
-        // TODO set x,y to LittleVgl
         lvgl.SetNewTapEvent(info.x, info.y);
-        return DisplayApp::TouchEvents::Tap;
+        return TouchEvents::Tap;
       case Pinetime::Drivers::Cst816S::Gestures::LongPress:
-        return DisplayApp::TouchEvents::LongTap;
+        return TouchEvents::LongTap;
       case Pinetime::Drivers::Cst816S::Gestures::DoubleTap:
-        return DisplayApp::TouchEvents::DoubleTap;
+        return TouchEvents::DoubleTap;
       case Pinetime::Drivers::Cst816S::Gestures::SlideRight:
-        return DisplayApp::TouchEvents::SwipeRight;
+        return TouchEvents::SwipeRight;
       case Pinetime::Drivers::Cst816S::Gestures::SlideLeft:
-        return DisplayApp::TouchEvents::SwipeLeft;
+        return TouchEvents::SwipeLeft;
       case Pinetime::Drivers::Cst816S::Gestures::SlideDown:
-        return DisplayApp::TouchEvents::SwipeDown;
+        return TouchEvents::SwipeDown;
       case Pinetime::Drivers::Cst816S::Gestures::SlideUp:
-        return DisplayApp::TouchEvents::SwipeUp;
+        return TouchEvents::SwipeUp;
       case Pinetime::Drivers::Cst816S::Gestures::None:
       default:
-        return DisplayApp::TouchEvents::None;
+        return TouchEvents::None;
     }
   }
-  return DisplayApp::TouchEvents::None;
+  return TouchEvents::None;
 }
 
 void DisplayApp::StartApp(DisplayApp::Apps app) {
-- 
cgit v1.2.3-70-g09d2