[gtk+] button: Fix ::clicked emission on touchscreens sending pointer events
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] button: Fix ::clicked emission on touchscreens sending pointer events
- Date: Thu, 25 Sep 2014 19:26:49 +0000 (UTC)
commit d17fd81d9b631acf76273b9dca2700250cbbe096
Author: Carlos Garnacho <carlosg gnome org>
Date: Thu Sep 25 15:24:46 2014 +0200
button: Fix ::clicked emission on touchscreens sending pointer events
When GtkGestureMultiPress::released happens, in_button should be unset
after emitting GtkButton::released, whose default implementation uses it.
Moreover, in_button should only be unset there for real touch events, not
guaranteed to trigger crossing events, as opposed to every pointer/touch
events from touchscreens.
https://bugzilla.gnome.org/show_bug.cgi?id=737297
gtk/gtkbutton.c | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 4f0fdc1..207bcbc 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -607,18 +607,16 @@ multipress_released_cb (GtkGestureMultiPress *gesture,
GtkButton *button = GTK_BUTTON (widget);
GtkButtonPrivate *priv = button->priv;
GdkEventSequence *sequence;
- const GdkEvent *event;
- GdkDevice *source;
+
+ g_signal_emit (button, button_signals[RELEASED], 0);
sequence = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (gesture));
- event = gtk_gesture_get_last_event (GTK_GESTURE (gesture), sequence);
- if (event)
+
+ if (sequence)
{
- source = gdk_event_get_source_device (event);
- if (source && gdk_device_get_source (source) == GDK_SOURCE_TOUCHSCREEN)
- priv->in_button = FALSE;
+ priv->in_button = FALSE;
+ gtk_button_update_state (button);
}
- g_signal_emit (button, button_signals[RELEASED], 0);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]