AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-04 09:40:19 +00:00
Code Issues Projects Releases Wiki Activity

widget: Set GDK_BUTTON1_MASK on emulated pointer events

Browse Source 
The touch_event handler was missing those when emulating pointer events
for the widgets that get GDK_TOUCH_MASK set, but have no specialized
touch handlers.
This commit is contained in:
Carlos Garnacho 2014-06-04 12:56:57 +02:00
parent 7a0642743d
commit cb059bfc1b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/gtkwidget.c
View File

@ -7218,6 +7218,9 @@ gtk_widget_real_touch_event (GtkWidget *widget,
bevent->button.axes = g_memdup (event->axes, bevent->button.axes = g_memdup (event->axes,
sizeof (gdouble) * gdk_device_get_n_axes (event->device)); sizeof (gdouble) * gdk_device_get_n_axes (event->device));
gdk_event_set_source_device (bevent, gdk_event_get_source_device ((GdkEvent*)event)); gdk_event_set_source_device (bevent, gdk_event_get_source_device ((GdkEvent*)event));
if (event->type == GDK_TOUCH_END)
bevent->button.state |= GDK_BUTTON1_MASK;
} }
else if (event->type == GDK_TOUCH_UPDATE) else if (event->type == GDK_TOUCH_UPDATE)
{ {
@ -7226,7 +7229,7 @@ gtk_widget_real_touch_event (GtkWidget *widget,
bevent->any.window = g_object_ref (event->window); bevent->any.window = g_object_ref (event->window);
bevent->any.send_event = FALSE; bevent->any.send_event = FALSE;
bevent->motion.time = event->time; bevent->motion.time = event->time;
bevent->motion.state = event->state; bevent->motion.state = event->state | GDK_BUTTON1_MASK;
bevent->motion.x_root = event->x_root; bevent->motion.x_root = event->x_root;
bevent->motion.y_root = event->y_root; bevent->motion.y_root = event->y_root;
bevent->motion.x = event->x; bevent->motion.x = event->x;