changeset 3320:0efc570c9932

RT-25269 Mac: FXScenegraph. Inertia does not work Reviewed-by: anthony
author Petr Pchelko <petr.pchelko@oracle.com>
date Wed, 17 Apr 2013 11:27:29 +0400
parents 5cee5697460c
children fd157e9246df
files glass/glass-lib-macosx/src/GlassViewDelegate.m
diffstat 1 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/glass/glass-lib-macosx/src/GlassViewDelegate.m	Wed Apr 17 09:21:21 2013 +0200
+++ b/glass/glass-lib-macosx/src/GlassViewDelegate.m	Wed Apr 17 11:27:29 2013 +0400
@@ -534,15 +534,15 @@
             // Can be inertia from scroll gesture, 
             // scroll gesture or mouse wheel itself
             //
-            // RT-22388
+            // RT-22388, RT-25269
             jint sender = com_sun_glass_ui_mac_MacGestureSupport_SCROLL_SRC_WHEEL;
-            if (self->gestureInProgress == YES) {
-                if (isInertialScroll(theEvent)) {
-                   sender = com_sun_glass_ui_mac_MacGestureSupport_SCROLL_SRC_INERTIA;
-                }
-                else {
-                    sender = com_sun_glass_ui_mac_MacGestureSupport_SCROLL_SRC_GESTURE;
-                }
+            if (isInertialScroll(theEvent))
+            {
+                sender = com_sun_glass_ui_mac_MacGestureSupport_SCROLL_SRC_INERTIA;
+            }
+            else if (self->gestureInProgress == YES)
+            {
+                sender = com_sun_glass_ui_mac_MacGestureSupport_SCROLL_SRC_GESTURE;
             }
             
             const jclass jGestureSupportClass = [GlassHelper ClassForName:"com.sun.glass.ui.mac.MacGestureSupport"