AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtkgesture: Do not cancel gesture when setting DENIED state

Browse Source 
Touchpoint state and tracking are tangential, this is mixing up both.
This change was added in the fixes for
https://gitlab.gnome.org/GNOME/gtk/-/issues/3016 but is now unnecessary.
This commit is contained in:
Carlos Garnacho 2021-11-15 23:45:47 +01:00
parent 615b8fc569
commit f36ee67226
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkgesture.c
View File

@ -1020,7 +1020,6 @@ gtk_gesture_set_sequence_state (GtkGesture *gesture,
{ {
GtkGesturePrivate *priv; GtkGesturePrivate *priv;
PointData *data; PointData *data;
GtkEventSequenceState current_state;
g_return_val_if_fail (GTK_IS_GESTURE (gesture), FALSE); g_return_val_if_fail (GTK_IS_GESTURE (gesture), FALSE);
g_return_val_if_fail (state >= GTK_EVENT_SEQUENCE_NONE && g_return_val_if_fail (state >= GTK_EVENT_SEQUENCE_NONE &&
@ -1044,13 +1043,8 @@ gtk_gesture_set_sequence_state (GtkGesture *gesture,
data->state != GTK_EVENT_SEQUENCE_NONE) data->state != GTK_EVENT_SEQUENCE_NONE)
return FALSE; return FALSE;
current_state = data->state;
data->state = state; data->state = state;
if (state == GTK_EVENT_SEQUENCE_DENIED &&
current_state == GTK_EVENT_SEQUENCE_CLAIMED)
_gtk_gesture_cancel_sequence (gesture, sequence);
gtk_widget_cancel_event_sequence (gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture)), gtk_widget_cancel_event_sequence (gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture)),
gesture, sequence, state); gesture, sequence, state);
g_signal_emit (gesture, signals[SEQUENCE_STATE_CHANGED], 0, g_signal_emit (gesture, signals[SEQUENCE_STATE_CHANGED], 0,