summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2012-03-04 11:17:30 -0500
committerMatthias Clasen <mclasen@redhat.com>2012-03-04 11:24:51 -0500
commit0e07d6589e539096e126940588faec31ce5cce9a (patch)
treeacddee8b4f2f2e389e335beac358ac18273773dd /gdk
parent3579b591c1d15b96b7b17475aa4f11c2d100efb0 (diff)
downloadgtk+-0e07d6589e539096e126940588faec31ce5cce9a.tar.gz
gdk: Don't drop the emulating_pointer flag
When manually copying touch events, we must not forget the emulating_pointer flag.
Diffstat (limited to 'gdk')
-rw-r--r--gdk/gdkwindow.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 9a053b88f0..72f0a18ee3 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -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);