From 2ebaafa6c9334071b664b15d045656250690dd96 Mon Sep 17 00:00:00 2001
From: Deve <[EMAIL REDACTED]>
Date: Tue, 18 Oct 2022 21:02:49 +0200
Subject: [PATCH] Use translationInView for mouse wheel event
---
src/video/uikit/SDL_uikitview.m | 39 +++++++++++++++++++++------------
1 file changed, 25 insertions(+), 14 deletions(-)
diff --git a/src/video/uikit/SDL_uikitview.m b/src/video/uikit/SDL_uikitview.m
index 77d398c204e8..fea10ff21355 100644
--- a/src/video/uikit/SDL_uikitview.m
+++ b/src/video/uikit/SDL_uikitview.m
@@ -455,25 +455,36 @@ - (void)pressesChanged:(NSSet<UIPress *> *)presses withEvent:(UIPressesEvent *)e
#endif /* TARGET_OS_TV || defined(__IPHONE_9_1) */
+static CGPoint translation_old = (CGPoint){ 0.0, 0.0 };
+
-(void)mouseWheelGesture:(UIPanGestureRecognizer *)gesture
{
if (gesture.state == UIGestureRecognizerStateBegan ||
- gesture.state == UIGestureRecognizerStateChanged ||
- gesture.state == UIGestureRecognizerStateEnded) {
- CGPoint velocity = [gesture velocityInView:self];
-
- if (velocity.x > 0.0f) {
- velocity.x = -1.0;
- } else if (velocity.x < 0.0f) {
- velocity.x = 1.0f;
+ gesture.state == UIGestureRecognizerStateChanged) {
+
+ CGPoint translation = [gesture translationInView:self];
+ CGPoint mouse_wheel = translation;
+
+ if (gesture.state == UIGestureRecognizerStateChanged) {
+ mouse_wheel.x -= translation_old.x;
+ mouse_wheel.y -= translation_old.y;
}
- if (velocity.y > 0.0f) {
- velocity.y = -1.0;
- } else if (velocity.y < 0.0f) {
- velocity.y = 1.0f;
+
+ translation_old = translation;
+
+ if (mouse_wheel.x > 0.0f) {
+ mouse_wheel.x = 1.0;
+ } else if (mouse_wheel.x < 0.0f) {
+ mouse_wheel.x = -1.0f;
+ }
+ if (mouse_wheel.y > 0.0f) {
+ mouse_wheel.y = 1.0;
+ } else if (mouse_wheel.y < 0.0f) {
+ mouse_wheel.y = -1.0f;
}
- if (velocity.x != 0.0f || velocity.y != 0.0f) {
- SDL_SendMouseWheel(sdlwindow, 0, velocity.x, velocity.y, SDL_MOUSEWHEEL_NORMAL);
+
+ if (mouse_wheel.x != 0.0f || mouse_wheel.y != 0.0f) {
+ SDL_SendMouseWheel(sdlwindow, 0, mouse_wheel.x, mouse_wheel.y, SDL_MOUSEWHEEL_NORMAL);
}
}
}