From: Carlos Garnacho <carlosg@gnome.org>
Date: Mon, 27 Feb 2012 12:08:38 +0000 (+0100)
Subject: gdk: Set correct GdkModifierType on pointer emulated events
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=0bb2e6f26489eda816121aeee1488e59ce6b6e6b;p=~andy%2Fgtk

gdk: Set correct GdkModifierType on pointer emulated events
---

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 52b650171..43721fcf2 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -9406,6 +9406,9 @@ proxy_pointer_event (GdkDisplay                 *display,
             return TRUE;
         }
 
+      if (is_touch_type (source_event->type) && !is_touch_type (event_type))
+        state |= GDK_BUTTON1_MASK;
+
       if (event_win &&
           gdk_device_get_device_type (device) != GDK_DEVICE_TYPE_MASTER &&
           gdk_window_get_device_events (event_win, device) == 0)
@@ -9636,6 +9639,9 @@ proxy_button_event (GdkEvent *source_event,
         return TRUE;
     }
 
+  if (source_event->type == GDK_TOUCH_END && !is_touch_type (type))
+    state |= GDK_BUTTON1_MASK;
+
   if (event_win == NULL || display->ignore_core_events)
     return TRUE;