callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtkmain: Handle rewriting of event fields during grabs for touchpad events

Browse Source 
The window/coordinates will need translation in the case of touchpad gesture
events, same than with other pointer events.
This commit is contained in:
Carlos Garnacho
2015-07-09 18:47:02 +02:00
parent 5092febaf8
commit 6cd45af8b0
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtkmain.c
View File

@ -1411,6 +1411,18 @@ rewrite_event_for_window (GdkEvent *event,
new_window, new_window,
&event->touch.x, &event->touch.y); &event->touch.x, &event->touch.y);
break; break;
case GDK_TOUCHPAD_SWIPE:
rewrite_events_translate (event->any.window,
new_window,
&event->touchpad_swipe.x,
&event->touchpad_swipe.y);
break;
case GDK_TOUCHPAD_PINCH:
rewrite_events_translate (event->any.window,
new_window,
&event->touchpad_pinch.x,
&event->touchpad_pinch.y);
break;
case GDK_KEY_PRESS: case GDK_KEY_PRESS:
case GDK_KEY_RELEASE: case GDK_KEY_RELEASE:
case GDK_PROXIMITY_IN: case GDK_PROXIMITY_IN:
@ -1460,6 +1472,8 @@ rewrite_event_for_grabs (GdkEvent *event)
case GDK_TOUCH_UPDATE: case GDK_TOUCH_UPDATE:
case GDK_TOUCH_END: case GDK_TOUCH_END:
case GDK_TOUCH_CANCEL: case GDK_TOUCH_CANCEL:
case GDK_TOUCHPAD_SWIPE:
case GDK_TOUCHPAD_PINCH:
display = gdk_window_get_display (event->any.window); display = gdk_window_get_display (event->any.window);
device = gdk_event_get_device (event); device = gdk_event_get_device (event);
@ -1819,6 +1833,8 @@ gtk_main_do_event (GdkEvent *event)
case GDK_TOUCH_UPDATE: case GDK_TOUCH_UPDATE:
case GDK_TOUCH_END: case GDK_TOUCH_END:
case GDK_TOUCH_CANCEL: case GDK_TOUCH_CANCEL:
case GDK_TOUCHPAD_SWIPE:
case GDK_TOUCHPAD_PINCH:
if (!_gtk_propagate_captured_event (grab_widget, event, topmost_widget)) if (!_gtk_propagate_captured_event (grab_widget, event, topmost_widget))
gtk_propagate_event (grab_widget, event); gtk_propagate_event (grab_widget, event);
break; break;