gdk: Relay scroll delta from GDK
authorEmmanuele Bassi <ebassi@linux.intel.com>
Mon, 19 Mar 2012 12:19:26 +0000 (12:19 +0000)
committerEmmanuele Bassi <ebassi@linux.intel.com>
Mon, 19 Mar 2012 14:29:23 +0000 (14:29 +0000)
clutter/gdk/clutter-event-gdk.c
clutter/gdk/clutter-stage-gdk.h

index 4e0e22f..3276996 100644 (file)
@@ -258,6 +258,9 @@ clutter_gdk_handle_event (GdkEvent *gdk_event)
       event->scroll.direction = gdk_event->scroll.direction;
       clutter_event_set_device (event, device);
       clutter_event_set_source_device (event, source_device);
+      clutter_event_set_scroll_delta (event,
+                                      gdk_event->scroll.delta_x,
+                                      gdk_event->scroll.delta_y);
       break;
 
     case GDK_WINDOW_STATE:
index 8c4cb20..4004955 100644 (file)
@@ -68,7 +68,8 @@ struct _ClutterStageGdkClass
    GDK_KEY_RELEASE_MASK |           \
    GDK_BUTTON_PRESS_MASK |          \
    GDK_BUTTON_RELEASE_MASK |        \
-   GDK_POINTER_MOTION_MASK)
+   GDK_POINTER_MOTION_MASK |         \
+   GDK_SCROLL_MASK)
 
 GType _clutter_stage_gdk_get_type (void) G_GNUC_CONST;