AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-13 05:50:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'treeview-gesture-claim' into 'main'

Browse Source 
treeview: Don't claim event sequence too early

Closes #3649, #3985, #4206, and #4669

See merge request GNOME/gtk!4883
This commit is contained in:
Carlos Garnacho 2022-09-02 12:40:15 +00:00
commit bce90df49d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtktreeview.c
View File

@ -2758,8 +2758,6 @@ gtk_tree_view_click_gesture_pressed (GtkGestureClick *gesture,
return; return;
} }
gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
if (n_press > 1) if (n_press > 1)
gtk_gesture_set_state (priv->drag_gesture, gtk_gesture_set_state (priv->drag_gesture,
GTK_EVENT_SEQUENCE_DENIED); GTK_EVENT_SEQUENCE_DENIED);
@ -2787,6 +2785,7 @@ gtk_tree_view_click_gesture_pressed (GtkGestureClick *gesture,
} }
grab_focus_and_unset_draw_keyfocus (tree_view); grab_focus_and_unset_draw_keyfocus (tree_view);
gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
return; return;
} }
@ -2910,6 +2909,7 @@ gtk_tree_view_click_gesture_pressed (GtkGestureClick *gesture,
{ {
GtkCellArea *area = gtk_cell_layout_get_area (GTK_CELL_LAYOUT (column)); GtkCellArea *area = gtk_cell_layout_get_area (GTK_CELL_LAYOUT (column));
cell_editable = gtk_cell_area_get_edit_widget (area); cell_editable = gtk_cell_area_get_edit_widget (area);
gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
if (cell_editable != NULL) if (cell_editable != NULL)
{ {
@ -2967,7 +2967,10 @@ gtk_tree_view_click_gesture_pressed (GtkGestureClick *gesture,
} }
if (button == GDK_BUTTON_PRIMARY && n_press == 2) if (button == GDK_BUTTON_PRIMARY && n_press == 2)
gtk_tree_view_row_activated (tree_view, path, column); {
gtk_tree_view_row_activated (tree_view, path, column);
gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
}
else else
{ {
if (n_press == 1) if (n_press == 1)