Fix ghost touching under Windows

xfangfang · Jul 3, 2024 · 5432d30 · 5432d30
1 parent f507b9b
commit 5432d30
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 5 deletions.
diff --git a/library/include/borealis/core/touch/pan_gesture.hpp b/library/include/borealis/core/touch/pan_gesture.hpp
@@ -77,6 +77,8 @@ class PanGestureRecognizer : public GestureRecognizer
     // Get pan gesture event
     PanGestureEvent getPanGestureEvent() const { return panEvent; }
 
+    static inline float panFactor{1.0f};
+
   private:
     int lastFingerId = 0;
     PanGestureEvent panEvent;

diff --git a/library/lib/core/touch/pan_gesture.cpp b/library/lib/core/touch/pan_gesture.cpp
@@ -130,6 +130,10 @@ GestureState PanGestureRecognizer::recognitionLoop(TouchState touch, MouseState
 
                 float velocityX = distanceX / time;
                 float velocityY = distanceY / time;
+                if (panFactor > 0.0f) {
+                    velocityX *= panFactor;
+                    velocityY *= panFactor;
+                }
 
                 acceleration.time.x = -fabs(velocityX) / PAN_SCROLL_ACCELERATION;
                 acceleration.time.y = -fabs(velocityY) / PAN_SCROLL_ACCELERATION;

diff --git a/library/lib/extern/glfw b/library/lib/extern/glfw
diff --git a/library/lib/platforms/glfw/glfw_input.cpp b/library/lib/platforms/glfw/glfw_input.cpp
@@ -101,14 +101,36 @@ static void glfwJoystickCallback(int jid, int event)
     Application::setActiveEvent(true);
 }
 
+#define GLFW_STICKY 4
 static RawTouchState touchState = { 0, 0, { 0, 0 } };
+static int touchStateStatus = GLFW_RELEASE;
+static bool touchUpdate = false;
+
+static inline int getTouchState()
+{
+    if (touchStateStatus == GLFW_STICKY)
+    {
+        touchStateStatus = GLFW_RELEASE;
+        // Try to ignore the touch end event as this can lead to a smaller calculation of scrolling acceleration
+        int res = touchUpdate ? GLFW_PRESS : GLFW_RELEASE;
+        touchUpdate = false;
+        return res;
+    }
+    else
+    {
+        touchUpdate = false;
+        return touchStateStatus;
+    }
+}
 
 static void glfwTouchCallback(GLFWwindow* window, int touch, int action, double xpos, double ypos)
 {
     touchState.fingerId   = 0;
-    touchState.pressed    = true;
+    touchState.pressed    = action != GLFW_RELEASE;
     touchState.position.x = xpos / Application::windowScale;
     touchState.position.y = ypos / Application::windowScale;
+    touchStateStatus      = touchState.pressed ? GLFW_PRESS : GLFW_STICKY;
+    touchUpdate          |= touchState.pressed;
     Application::setActiveEvent(true);
 }
 
@@ -320,10 +342,10 @@ bool sameSign(int a, int b)
 
 void GLFWInputManager::updateTouchStates(std::vector<RawTouchState>* states)
 {
-    if (touchState.pressed)
+    if (getTouchState()) {
+        touchState.pressed = true;
         states->push_back(touchState);
-
-    touchState.pressed = false;
+    }
 }
 
 void GLFWInputManager::updateMouseStates(RawMouseState* state)