diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-11-16 20:16:10 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-11-16 20:16:10 +0000 |
| commit | 50c29398e659e8579fc238e2e9333b48171f9871 (patch) | |
| tree | d1882129215f28a226714eb092851bd6ff66a7e8 | |
| parent | dff8a9eb46b2e4dbdc9d3176cd6fd0ebce2eb692 (diff) | |
| parent | 49613dca8efcae2bffdfdebd3e76735b49fa6de4 (diff) | |
| download | gtk+-50c29398e659e8579fc238e2e9333b48171f9871.tar.gz | |
Merge branch 'wip/exalm/button' into 'master'
Allow pressing multiple buttons at once on touch
See merge request GNOME/gtk!2813
| -rw-r--r-- | gtk/gtkbutton.c | 1 | ||||
| -rw-r--r-- | gtk/gtkgestureclick.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index 9e9a15a422..c4038765a4 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -405,7 +405,6 @@ gtk_button_init (GtkButton *button) priv->gesture = gtk_gesture_click_new (); gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (priv->gesture), FALSE); - gtk_gesture_single_set_exclusive (GTK_GESTURE_SINGLE (priv->gesture), TRUE); gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->gesture), GDK_BUTTON_PRIMARY); g_signal_connect (priv->gesture, "pressed", G_CALLBACK (click_pressed_cb), button); g_signal_connect (priv->gesture, "released", G_CALLBACK (click_released_cb), button); diff --git a/gtk/gtkgestureclick.c b/gtk/gtkgestureclick.c index 98e8b7dd08..1af276bd15 100644 --- a/gtk/gtkgestureclick.c +++ b/gtk/gtkgestureclick.c @@ -272,7 +272,7 @@ gtk_gesture_click_end (GtkGesture *gesture, interpreted = gtk_gesture_get_point (gesture, current, &x, &y); state = gtk_gesture_get_sequence_state (gesture, current); - if (state != GTK_EVENT_SEQUENCE_DENIED && interpreted) + if (current == sequence && state != GTK_EVENT_SEQUENCE_DENIED && interpreted) g_signal_emit (gesture, signals[RELEASED], 0, priv->n_release, x, y); priv->n_release = 0; |