[clutter] gdk: Relay scroll delta from GDK
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter] gdk: Relay scroll delta from GDK
- Date: Mon, 19 Mar 2012 14:49:15 +0000 (UTC)
commit ab3582be1cca307350389ca6bcb326b4fce35d73
Author: Emmanuele Bassi <ebassi linux intel com>
Date: Mon Mar 19 12:19:26 2012 +0000
gdk: Relay scroll delta from GDK
clutter/gdk/clutter-event-gdk.c | 3 +++
clutter/gdk/clutter-stage-gdk.h | 3 ++-
2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/clutter/gdk/clutter-event-gdk.c b/clutter/gdk/clutter-event-gdk.c
index 4e0e22f..3276996 100644
--- a/clutter/gdk/clutter-event-gdk.c
+++ b/clutter/gdk/clutter-event-gdk.c
@@ -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:
diff --git a/clutter/gdk/clutter-stage-gdk.h b/clutter/gdk/clutter-stage-gdk.h
index 8c4cb20..4004955 100644
--- a/clutter/gdk/clutter-stage-gdk.h
+++ b/clutter/gdk/clutter-stage-gdk.h
@@ -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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]