]> Pileus Git - ~andy/gtk/commitdiff
gdk: Set correct GdkModifierType on pointer emulated events
authorCarlos Garnacho <carlosg@gnome.org>
Mon, 27 Feb 2012 12:08:38 +0000 (13:08 +0100)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 1 Mar 2012 21:25:27 +0000 (16:25 -0500)
gdk/gdkwindow.c

index 52b650171a0cd15462916f8406873422124426bf..43721fcf206a10974e07942151907d37bbbe4085 100644 (file)
@@ -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;