]> Pileus Git - ~andy/gtk/commitdiff
gdk: Don't drop the emulating_pointer flag
authorMatthias Clasen <mclasen@redhat.com>
Sun, 4 Mar 2012 16:17:30 +0000 (11:17 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Sun, 4 Mar 2012 16:24:51 +0000 (11:24 -0500)
When manually copying touch events, we must not forget the
emulating_pointer flag.

gdk/gdkwindow.c

index 9a053b88f0dbf8ad779ddde64669cad58d2ab267..72f0a18ee3201f8f53ebaa3b4aa39199af0494cd 100644 (file)
@@ -9484,6 +9484,7 @@ proxy_pointer_event (GdkDisplay                 *display,
               event->touch.time = time_;
               event->touch.state = state | GDK_BUTTON1_MASK;
               event->touch.sequence = source_event->touch.sequence;
+              event->touch.emulating_pointer = source_event->touch.emulating_pointer;
               convert_toplevel_coords_to_window (event_win,
                                                  toplevel_x, toplevel_y,
                                                  &event->touch.x, &event->touch.y);
@@ -9772,6 +9773,7 @@ proxy_button_event (GdkEvent *source_event,
       event->touch.axes = g_memdup (source_event->touch.axes,
                                      sizeof (gdouble) * gdk_device_get_n_axes (source_event->touch.device));
       event->touch.sequence = source_event->touch.sequence;
+      event->touch.emulating_pointer = source_event->touch.emulating_pointer;
 
       gdk_event_set_source_device (event, source_device);