4 files changed, 13 insertions, 20 deletions
diff --git a/src/displayapp/screens/settings/QuickSettings.cpp b/src/displayapp/screens/settings/QuickSettings.cpp
index 2da5ca27..076bea82 100644
--- a/src/displayapp/screens/settings/QuickSettings.cpp
+++ b/src/displayapp/screens/settings/QuickSettings.cpp
@@ -154,17 +154,6 @@ 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;
-  }
-}
-
 bool QuickSettings::Refresh() {
   return running;
 }
diff --git a/src/displayapp/screens/settings/QuickSettings.h b/src/displayapp/screens/settings/QuickSettings.h
index a14f46bf..e0fc0a87 100644
--- a/src/displayapp/screens/settings/QuickSettings.h
+++ b/src/displayapp/screens/settings/QuickSettings.h
@@ -29,7 +29,6 @@ namespace Pinetime {
 
         bool Refresh() override;
 
-        bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
         void OnButtonEvent(lv_obj_t* object, lv_event_t event);
 
         void UpdateScreen();
diff --git a/src/touchhandler/TouchHandler.cpp b/src/touchhandler/TouchHandler.cpp
index 86dc29f6..160b5e14 100644
--- a/src/touchhandler/TouchHandler.cpp
+++ b/src/touchhandler/TouchHandler.cpp
@@ -29,11 +29,23 @@ void TouchHandler::Process(void* instance) {
 
 void TouchHandler::Work() {
   Pinetime::Drivers::Cst816S::TouchInfos info;
+  Pinetime::Drivers::Cst816S::Gestures prevGesture = Pinetime::Drivers::Cst816S::Gestures::None;
   while (true) {
     vTaskSuspend(taskHandle);
+
     info = touchPanel.GetTouchInfo();
+
+    if (info.gesture != Pinetime::Drivers::Cst816S::Gestures::None) {
+      if (prevGesture != info.gesture) {
+        if (info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideDown || info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideLeft ||
+            info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideUp || info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideRight) {
+          prevGesture = info.gesture;
+        }
+        gesture = info.gesture;
+      }
+    }
+
     if (systemTask->IsSleeping()) {
-      gesture = info.gesture;
       systemTask->PushMessage(System::Messages::TouchWakeUp);
     } else {
       x = info.x;
@@ -42,12 +54,6 @@ void TouchHandler::Work() {
         if (!isCancelled) {
           lvgl.SetNewTouchPoint(info.x, info.y, true);
         }
-        if (info.gesture != Pinetime::Drivers::Cst816S::Gestures::None) {
-          if (prevGesture != info.gesture) {
-            prevGesture = info.gesture;
-            gesture = info.gesture;
-          }
-        }
       } else {
         if (isCancelled) {
           lvgl.SetNewTouchPoint(-1, -1, false);
diff --git a/src/touchhandler/TouchHandler.h b/src/touchhandler/TouchHandler.h
index 7999e00a..37ef5af2 100644
--- a/src/touchhandler/TouchHandler.h
+++ b/src/touchhandler/TouchHandler.h
@@ -37,7 +37,6 @@ namespace Pinetime {
         Pinetime::Drivers::Cst816S& touchPanel;
         Pinetime::Components::LittleVgl& lvgl;
         Pinetime::Drivers::Cst816S::Gestures gesture;
-        Pinetime::Drivers::Cst816S::Gestures prevGesture;
         bool isCancelled = false;
         uint8_t x, y;
     };