summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hult <richard@imendio.com>2008-02-16 09:49:52 +0000
committerRichard Hult <rhult@src.gnome.org>2008-02-16 09:49:52 +0000
commitccc8afdbf286a60b1e29eec3afcc481632df9ac7 (patch)
treed6a2f1a670071476f7d9d9252f2d99540358aea0
parent7d5bcbfcf01b1c76533ce39b6d8f05438f2fc541 (diff)
downloadgdk-pixbuf-ccc8afdbf286a60b1e29eec3afcc481632df9ac7.tar.gz
Add state to the scroll event (bug #516757, Paul Davis).
2008-02-16 Richard Hult <richard@imendio.com> * gdk/quartz/gdkevents-quartz.c (create_scroll_event): Add state to the scroll event (bug #516757, Paul Davis). svn path=/trunk/; revision=19598
-rw-r--r--ChangeLog5
-rw-r--r--gdk/quartz/gdkevents-quartz.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b5ede0409..0a12670ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-16 Richard Hult <richard@imendio.com>
+
+ * gdk/quartz/gdkevents-quartz.c (create_scroll_event): Add state
+ to the scroll event (bug #516757, Paul Davis).
+
2008-02-16 Matthias Clasen <mclasen@redhat.com>
* NEWS: Updates
diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
index aded4d4d0..e8418878d 100644
--- a/gdk/quartz/gdkevents-quartz.c
+++ b/gdk/quartz/gdkevents-quartz.c
@@ -1439,6 +1439,7 @@ create_scroll_event (GdkWindow *window,
point = [nsevent locationInWindow];
event->scroll.x = point.x;
event->scroll.y = point.y;
+ event->scroll.state = get_keyboard_modifiers_from_ns_event (nsevent);
convert_window_coordinates_to_root (window, event->scroll.x, event->scroll.y,
&event->scroll.x_root,
&event->scroll.y_root);