8242577: Cell selection fails on iOS most of the times

Reviewed-by: jvos
openjdk · Apr 20, 2020 · 5e9fb82 · 5e9fb82
1 parent 69e4266
commit 5e9fb82
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/modules/javafx.graphics/src/main/native-glass/ios/GlassViewDelegate.h b/modules/javafx.graphics/src/main/native-glass/ios/GlassViewDelegate.h
@@ -57,6 +57,7 @@ typedef __attribute__((NSObject)) CFMutableDictionaryRef GlassMutableDictionaryR
 // touches
 @property (nonatomic, strong) GlassMutableDictionaryRef touches;
 @property (nonatomic) jlong lastTouchId;
+@property (nonatomic) CGPoint beginTouchEventPoint; // coordinates at the beginning of a 'touch' event
 // gestures
 @property (nonatomic, retain) GlassGestureDelegate *delegate;
 

diff --git a/modules/javafx.graphics/src/main/native-glass/ios/GlassViewDelegate.m b/modules/javafx.graphics/src/main/native-glass/ios/GlassViewDelegate.m
@@ -96,6 +96,7 @@ @implementation GlassViewDelegate
 @synthesize isScrolling;
 @synthesize mouseTouch;
 @synthesize lastEventPoint;
+@synthesize beginTouchEventPoint;
 
 
 - (void)touchesBeganCallback:(NSSet *)involvedTouches withEvent:(UIEvent *)event
@@ -116,6 +117,7 @@ - (void)touchesBeganCallback:(NSSet *)involvedTouches withEvent:(UIEvent *)event
     if (self.mouseTouch == nil) {
         UITouch *touch = [[event allTouches] anyObject];
         CGPoint viewPoint = [touch locationInView:self.uiView.superview];
+        self.beginTouchEventPoint = viewPoint;
 
         self.mouseTouch = touch;
 
@@ -144,7 +146,11 @@ - (void)touchesMovedCallback:(NSSet *)involvedTouches withEvent:(UIEvent *)event
     // emulate mouse
     if (self.mouseTouch != nil && [involvedTouches containsObject:self.mouseTouch] == YES) {
         CGPoint viewPoint = [self.mouseTouch locationInView:self.uiView.superview];
-        [self sendJavaMouseEvent:viewPoint type:com_sun_glass_events_MouseEvent_DRAG button:com_sun_glass_events_MouseEvent_BUTTON_LEFT];
+        // iOS might send one or more 'NSTouchPhaseMoved', even if the initial event location didn't change.
+        // This check prevents emulating mouse drag events in such cases
+        if (!CGPointEqualToPoint(viewPoint, self.beginTouchEventPoint)) {
+            [self sendJavaMouseEvent:viewPoint type:com_sun_glass_events_MouseEvent_DRAG button:com_sun_glass_events_MouseEvent_BUTTON_LEFT];
+        }
     }
 }