From 5ca2f0689391bfaa6ef32e6c7c1225d5d3a9751b Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Wed, 9 Nov 2011 00:34:45 +0100 Subject: [PATCH] quartz: include all buttons' state in GdkEventMotion.state (cherry picked from commit 3b5c5710daa337b61c9e2135e3e55c380e5bc991) --- gdk/quartz/gdkevents-quartz.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c index f3b090dd8..3528f3582 100644 --- a/gdk/quartz/gdkevents-quartz.c +++ b/gdk/quartz/gdkevents-quartz.c @@ -848,22 +848,6 @@ fill_motion_event (GdkWindow *window, gint x_root, gint y_root) { - GdkModifierType state; - - state = get_keyboard_modifiers_from_ns_event (nsevent); - - switch ([nsevent type]) - { - case NSLeftMouseDragged: - case NSRightMouseDragged: - case NSOtherMouseDragged: - state |= get_mouse_button_modifiers_from_ns_event (nsevent); - break; - - case NSMouseMoved: - break; - } - event->any.type = GDK_MOTION_NOTIFY; event->motion.window = window; event->motion.time = get_time_from_ns_event (nsevent); @@ -872,7 +856,8 @@ fill_motion_event (GdkWindow *window, event->motion.x_root = x_root; event->motion.y_root = y_root; /* FIXME event->axes */ - event->motion.state = state; + event->motion.state = get_keyboard_modifiers_from_ns_event (nsevent) | + _gdk_quartz_events_get_current_mouse_modifiers (); event->motion.is_hint = FALSE; event->motion.device = _gdk_display->core_pointer; } -- 2.43.2