From 88a4458cfe2f9fe83465c3515b5f10af6863f871 Mon Sep 17 00:00:00 2001
From: Malte Langermann <54738901+gagarinlg@users.noreply.github.com>
Date: Fri, 21 Jan 2022 11:29:18 +0100
Subject: [PATCH] fix: Resolve some issues with touch TE_SLIDE_END, and
 tapCount on NV14 (#1434)

* move TE_SLIDE_END handling for slide inertia to libopenui
reset tapCount on TE_SLIDE_END on NV14

* Bump libopenui

Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
---
 radio/src/targets/horus/tp_gt911.cpp    | 2 +-
 radio/src/targets/nv14/touch_driver.cpp | 6 +++---
 radio/src/thirdparty/libopenui          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/radio/src/targets/horus/tp_gt911.cpp b/radio/src/targets/horus/tp_gt911.cpp
index 86984d903..2059440b8 100644
--- a/radio/src/targets/horus/tp_gt911.cpp
+++ b/radio/src/targets/horus/tp_gt911.cpp
@@ -793,7 +793,7 @@ struct TouchState touchPanelRead()
           internalTouchState.tapCount = tapCount;
           tapTime = now;
         }
-      } else if (internalTouchState.event != TE_SLIDE_END) {
+      } else {
         internalTouchState.event = TE_NONE;
       }
     }
diff --git a/radio/src/targets/nv14/touch_driver.cpp b/radio/src/targets/nv14/touch_driver.cpp
index fff2b3d62..d5b989dd6 100644
--- a/radio/src/targets/nv14/touch_driver.cpp
+++ b/radio/src/targets/nv14/touch_driver.cpp
@@ -545,15 +545,15 @@ TouchState touchPanelRead()
       }
       downTime = 0;
     } else {
-      internalTouchState.x = LCD_WIDTH;
-      internalTouchState.y = LCD_HEIGHT;
+      tapCount = 0;
+      internalTouchState.tapCount = 0;
       internalTouchState.event = TE_SLIDE_END;
     }
   }
   TouchState ret = internalTouchState;
   internalTouchState.deltaX = 0;
   internalTouchState.deltaY = 0;
-  if(internalTouchState.event == TE_UP)
+  if(internalTouchState.event == TE_UP || internalTouchState.event == TE_SLIDE_END)
     internalTouchState.event = TE_NONE;
   return ret;
 }
diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui
index bfa6720b9..f19339587 160000
--- a/radio/src/thirdparty/libopenui
+++ b/radio/src/thirdparty/libopenui
@@ -1 +1 @@
-Subproject commit bfa6720b9f656c5f65cbcd0b0c577c8f9cd83c36
+Subproject commit f193395874ef6d371ce4fca9c3c222db88d60816