AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 05:31:07 +00:00
Code Issues Projects Releases Wiki Activity

gtkmodelbutton: Ignore releases outside of the button

Browse Source 
This is also how regular buttons behave. Otherwise releasing on a
different menu item would register a click on the item that was
originally pressed. In these cases it is better to not register a click
at all.

Closes: https://gitlab.gnome.org/GNOME/gtk/-/issues/5760
This commit is contained in:
Sebastian Keller 2023-04-21 00:31:53 +02:00
parent 248d13d8dc
commit a678e9fdd9
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gtk/gtkmodelbutton.c
View File

@ -1450,9 +1450,26 @@ gesture_pressed (GtkGestureClick *gesture,
}
static void
emit_clicked (GtkModelButton *button)
gesture_released (GtkGestureClick *gesture,
guint n_press,
double x,
double y,
GtkWidget *widget)
{
g_signal_emit (button, signals[SIGNAL_CLICKED], 0);
if (gtk_widget_contains (widget, x, y))
g_signal_emit (widget, signals[SIGNAL_CLICKED], 0);
}
static void
gesture_unpaired_release (GtkGestureClick *gesture,
double x,
double y,
guint button,
GdkEventSequence *sequence,
GtkWidget *widget)
{
if (gtk_widget_contains (widget, x, y))
g_signal_emit (widget, signals[SIGNAL_CLICKED], 0);
}
static void
@ -1489,8 +1506,8 @@ gtk_model_button_init (GtkModelButton *self)
gtk_gesture_single_set_exclusive (GTK_GESTURE_SINGLE (gesture), TRUE);
gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_PRIMARY);
g_signal_connect (gesture, "pressed", G_CALLBACK (gesture_pressed), self);
g_signal_connect_swapped (gesture, "released", G_CALLBACK (emit_clicked), self);
g_signal_connect_swapped (gesture, "unpaired-release", G_CALLBACK (emit_clicked), self);
g_signal_connect (gesture, "released", G_CALLBACK (gesture_released), self);
g_signal_connect (gesture, "unpaired-release", G_CALLBACK (gesture_unpaired_release), self);
gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture), GTK_PHASE_CAPTURE);
gtk_widget_add_controller (GTK_WIDGET (self), GTK_EVENT_CONTROLLER (gesture));
}