MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverts previous commit and fixes GESTURE_DRAG to not trigger GESTURE_SWIPE* when it ends

Browse Source
This commit is contained in:
ubkp 2023-12-08 15:08:05 -03:00
parent 1c20a582a5
commit b91be46c05
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/platforms/rcore_desktop_sdl.c
View File

@ -996,6 +996,7 @@ void PollInputEvents(void)
CORE.Input.Touch.position[0] = CORE.Input.Mouse.currentPosition; CORE.Input.Touch.position[0] = CORE.Input.Mouse.currentPosition;
int touchAction = -1; // 0-TOUCH_ACTION_UP, 1-TOUCH_ACTION_DOWN, 2-TOUCH_ACTION_MOVE int touchAction = -1; // 0-TOUCH_ACTION_UP, 1-TOUCH_ACTION_DOWN, 2-TOUCH_ACTION_MOVE
bool gestureUpdate = false; // Flag to note gestures require to update
bool realTouch = false; // Flag to differentiate real touch gestures from mouse ones bool realTouch = false; // Flag to differentiate real touch gestures from mouse ones
// Register previous keys states // Register previous keys states
@ -1141,6 +1142,7 @@ void PollInputEvents(void)
CORE.Input.Touch.currentTouchState[btn] = 1; CORE.Input.Touch.currentTouchState[btn] = 1;
touchAction = 1; touchAction = 1;
gestureUpdate = true;
} break; } break;
case SDL_MOUSEBUTTONUP: case SDL_MOUSEBUTTONUP:
{ {
@ -1154,6 +1156,7 @@ void PollInputEvents(void)
CORE.Input.Touch.currentTouchState[btn] = 0; CORE.Input.Touch.currentTouchState[btn] = 0;
touchAction = 0; touchAction = 0;
gestureUpdate = true;
} break; } break;
case SDL_MOUSEWHEEL: case SDL_MOUSEWHEEL:
{ {
@ -1176,6 +1179,7 @@ void PollInputEvents(void)
CORE.Input.Touch.position[0] = CORE.Input.Mouse.currentPosition; CORE.Input.Touch.position[0] = CORE.Input.Mouse.currentPosition;
touchAction = 2; touchAction = 2;
gestureUpdate = true;
} break; } break;
// Check touch events // Check touch events
@ -1188,6 +1192,7 @@ void PollInputEvents(void)
CORE.Input.Touch.position[touchId].y = event.tfinger.y * CORE.Window.screen.height; CORE.Input.Touch.position[touchId].y = event.tfinger.y * CORE.Window.screen.height;
touchAction = 1; touchAction = 1;
gestureUpdate = true;
realTouch = true; realTouch = true;
} break; } break;
case SDL_FINGERUP: case SDL_FINGERUP:
@ -1198,6 +1203,7 @@ void PollInputEvents(void)
CORE.Input.Touch.position[touchId].y = event.tfinger.y * CORE.Window.screen.height; CORE.Input.Touch.position[touchId].y = event.tfinger.y * CORE.Window.screen.height;
touchAction = 0; touchAction = 0;
gestureUpdate = true;
realTouch = true; realTouch = true;
} break; } break;
case SDL_FINGERMOTION: case SDL_FINGERMOTION:
@ -1207,6 +1213,7 @@ void PollInputEvents(void)
CORE.Input.Touch.position[touchId].y = event.tfinger.y * CORE.Window.screen.height; CORE.Input.Touch.position[touchId].y = event.tfinger.y * CORE.Window.screen.height;
touchAction = 2; touchAction = 2;
gestureUpdate = true;
realTouch = true; realTouch = true;
} break; } break;
@ -1232,7 +1239,7 @@ void PollInputEvents(void)
} }
#if defined(SUPPORT_GESTURES_SYSTEM) #if defined(SUPPORT_GESTURES_SYSTEM)
if (touchAction > -1) if (gestureUpdate)
{ {
// Process mouse events as touches to be able to use mouse-gestures // Process mouse events as touches to be able to use mouse-gestures
GestureEvent gestureEvent = { 0 }; GestureEvent gestureEvent = { 0 };
@ -1256,6 +1263,8 @@ void PollInputEvents(void)
// Gesture data is sent to gestures-system for processing // Gesture data is sent to gestures-system for processing
ProcessGestureEvent(gestureEvent); ProcessGestureEvent(gestureEvent);
gestureUpdate = false;
} }
#endif #endif
} }