summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2016-08-04 19:17:21 +0200
committerCarlos Garnacho <carlosg@gnome.org>2016-08-23 21:01:44 +0200
commit3a6d0ff2ab05c66f18fd1aa740029976b30ac1bc (patch)
tree5cbd9a37e171d99c7c91ac12fa48fca4d37aefc6
parentb8a77d4da310556014b06cf34cca2e9592da63fd (diff)
downloadgtk+-3a6d0ff2ab05c66f18fd1aa740029976b30ac1bc.tar.gz
gtk: Add minimal handling of pad events
No real handling is yet performed, to be done through a GdkEventController https://bugzilla.gnome.org/show_bug.cgi?id=770026
-rw-r--r--gtk/gtkmain.c5
-rw-r--r--gtk/gtkwidget.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index d0d91efdd6..ad6ed506a4 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1875,6 +1875,11 @@ gtk_main_do_event (GdkEvent *event)
case GDK_TOUCH_CANCEL:
case GDK_TOUCHPAD_SWIPE:
case GDK_TOUCHPAD_PINCH:
+ case GDK_PAD_BUTTON_PRESS:
+ case GDK_PAD_BUTTON_RELEASE:
+ case GDK_PAD_RING:
+ case GDK_PAD_STRIP:
+ case GDK_PAD_GROUP_MODE:
if (!_gtk_propagate_captured_event (grab_widget, event, topmost_widget))
gtk_propagate_event (grab_widget, event);
break;
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 3bb621f815..cbfb6733ba 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -7617,6 +7617,11 @@ gtk_widget_event_internal (GtkWidget *widget,
case GDK_TOUCHPAD_PINCH:
return_val |= _gtk_widget_run_controllers (widget, event, GTK_PHASE_BUBBLE);
/* Fall through */
+ case GDK_PAD_BUTTON_PRESS:
+ case GDK_PAD_BUTTON_RELEASE:
+ case GDK_PAD_RING:
+ case GDK_PAD_STRIP:
+ case GDK_PAD_GROUP_MODE:
case GDK_EXPOSE:
case GDK_NOTHING:
signal_num = -1;