callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip/carlosg/sequence-accepted-in-group-3-24' into 'gtk-3-24'

Browse Source 
gtkgesture: Apply gesture group state after setting up sequence

See merge request GNOME/gtk!3774
This commit is contained in:
Matthias Clasen
2021-07-21 12:49:22 +00:00
parent bc1ab236bd 944a75659c
commit 998f4f32cc
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gtk/gtkgesture.c
View File

@ -585,8 +585,6 @@ _gtk_gesture_update_point (GtkGesture *gesture,
NULL, (gpointer *) &data);
if (!existed)
{
GtkEventSequenceState group_state;
if (!add)
return FALSE;
@ -599,9 +597,6 @@ _gtk_gesture_update_point (GtkGesture *gesture,
data = g_new0 (PointData, 1);
g_hash_table_insert (priv->points, sequence, data);
group_state = gtk_gesture_get_group_state (gesture, sequence);
gtk_gesture_set_sequence_state (gesture, sequence, group_state);
}
if (data->event)
@ -611,13 +606,24 @@ _gtk_gesture_update_point (GtkGesture *gesture,
_update_touchpad_deltas (data);
_update_widget_coordinates (gesture, data);
/* Deny the sequence right away if the expected
* number of points is exceeded, so this sequence
* can be tracked with gtk_gesture_handles_sequence().
*/
if (!existed && _gtk_gesture_get_n_physical_points (gesture, FALSE) > priv->n_points)
gtk_gesture_set_sequence_state (gesture, sequence,
GTK_EVENT_SEQUENCE_DENIED);
if (!existed)
{
GtkEventSequenceState state;
/* Deny the sequence right away if the expected
* number of points is exceeded, so this sequence
* can be tracked with gtk_gesture_handles_sequence().
*
* Otherwise, make the sequence inherit the same state
* from other gestures in the same group.
*/
if (_gtk_gesture_get_n_physical_points (gesture, FALSE) > priv->n_points)
state = GTK_EVENT_SEQUENCE_DENIED;
else
state = gtk_gesture_get_group_state (gesture, sequence);
gtk_gesture_set_sequence_state (gesture, sequence, state);
}
return TRUE;
}