From 123c6f19176c5e86ff040eb4b059cbe1b4876ba5 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Fri, 11 Jun 2021 13:26:28 +0300
Subject: [PATCH 1/3] Fix touchevent tap

---
 src/displayapp/DisplayApp.cpp                     | 11 +++++------
 src/displayapp/DisplayApp.h                       |  2 +-
 src/displayapp/screens/settings/QuickSettings.cpp |  9 +--------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 7b03d569..c8e5d2e8 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -162,7 +162,8 @@ void DisplayApp::Refresh() {
       case Messages::TouchEvent: {
         if (state != States::Running)
           break;
-        auto gesture = OnTouchEvent();
+        auto info = touchPanel.GetTouchInfo();
+        auto gesture = OnTouchEvent(info);
         if (!currentScreen->OnTouchEvent(gesture)) {
           if (currentApp == Apps::Clock) {
             switch (gesture) {
@@ -183,6 +184,8 @@ void DisplayApp::Refresh() {
             }
           } else if (returnTouchEvent == gesture) {
             LoadApp(returnToApp, returnDirection);
+          } else if (touchMode == TouchModes::Gestures) {
+            lvgl.SetNewTapEvent(info.x, info.y);
           }
         }
       } break;
@@ -368,14 +371,10 @@ void DisplayApp::PushMessage(Messages msg) {
   }
 }
 
-TouchEvents DisplayApp::OnTouchEvent() {
-  auto info = touchPanel.GetTouchInfo();
+TouchEvents DisplayApp::OnTouchEvent(Pinetime::Drivers::Cst816S::TouchInfos info) {
   if (info.isTouch) {
     switch (info.gesture) {
       case Pinetime::Drivers::Cst816S::Gestures::SingleTap:
-        if (touchMode == TouchModes::Gestures) {
-          lvgl.SetNewTapEvent(info.x, info.y);
-        }
         return TouchEvents::Tap;
       case Pinetime::Drivers::Cst816S::Gestures::LongPress:
         return TouchEvents::LongTap;
diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h
index 0c7bd216..14cd7ad5 100644
--- a/src/displayapp/DisplayApp.h
+++ b/src/displayapp/DisplayApp.h
@@ -100,7 +100,7 @@ namespace Pinetime {
 
       TouchModes touchMode = TouchModes::Gestures;
 
-      TouchEvents OnTouchEvent();
+      TouchEvents OnTouchEvent(Pinetime::Drivers::Cst816S::TouchInfos);
       void RunningState();
       void IdleState();
       static void Process(void* instance);
diff --git a/src/displayapp/screens/settings/QuickSettings.cpp b/src/displayapp/screens/settings/QuickSettings.cpp
index 3994794d..20d2cd22 100644
--- a/src/displayapp/screens/settings/QuickSettings.cpp
+++ b/src/displayapp/screens/settings/QuickSettings.cpp
@@ -155,14 +155,7 @@ void QuickSettings::OnButtonEvent(lv_obj_t* object, lv_event_t event) {
 }
 
 bool QuickSettings::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
-  switch (event) {
-    case Pinetime::Applications::TouchEvents::SwipeLeft:
-      running = false;
-      return false;
-
-    default:
-      return true;
-  }
+  return false;
 }
 
 bool QuickSettings::Refresh() {

From 21b6f85140f0424b9e6c8371db7e190dd0303182 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Fri, 11 Jun 2021 14:46:03 +0300
Subject: [PATCH 2/3] Fix regression

---
 src/displayapp/DisplayApp.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index c8e5d2e8..b45822de 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -185,7 +185,9 @@ void DisplayApp::Refresh() {
           } else if (returnTouchEvent == gesture) {
             LoadApp(returnToApp, returnDirection);
           } else if (touchMode == TouchModes::Gestures) {
-            lvgl.SetNewTapEvent(info.x, info.y);
+            if (gesture == TouchEvents::Tap) {
+              lvgl.SetNewTapEvent(info.x, info.y);
+            }
           }
         }
       } break;

From 239b5547eae64d05f5d7544f0e11bfb877a75a02 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Fri, 11 Jun 2021 14:55:37 +0300
Subject: [PATCH 3/3] Fix another regression

---
 src/displayapp/screens/FlashLight.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/displayapp/screens/FlashLight.cpp b/src/displayapp/screens/FlashLight.cpp
index 4568db40..8d647a36 100644
--- a/src/displayapp/screens/FlashLight.cpp
+++ b/src/displayapp/screens/FlashLight.cpp
@@ -70,5 +70,5 @@ bool FlashLight::Refresh() {
 }
 
 bool FlashLight::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
-  return true;
+  return false;
 }