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

listbox: Fix shift-selection

Browse Source 
Selecting a range of rows with Shift-click was accidentally broken
in e6e511eb46. Make it work again.
This commit is contained in:
Matthias Clasen 2015-07-26 02:40:26 -04:00
parent 6ac07a2e85
commit 58fa3d96a8
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtklistbox.c
View File

@ -1034,10 +1034,7 @@ gtk_list_box_set_selection_mode (GtkListBox *box,
if (mode == GTK_SELECTION_NONE || if (mode == GTK_SELECTION_NONE ||
priv->selection_mode == GTK_SELECTION_MULTIPLE) priv->selection_mode == GTK_SELECTION_MULTIPLE)
{ dirty = gtk_list_box_unselect_all_internal (box);
dirty = gtk_list_box_unselect_all_internal (box);
priv->selected_row = NULL;
}
priv->selection_mode = mode; priv->selection_mode = mode;
@ -1649,15 +1646,20 @@ gtk_list_box_update_selection (GtkListBox *box,
{ {
if (extend) if (extend)
{ {
GtkListBoxRow *selected_row;
selected_row = priv->selected_row;
gtk_list_box_unselect_all_internal (box); gtk_list_box_unselect_all_internal (box);
if (priv->selected_row == NULL)
if (selected_row == NULL)
{ {
gtk_list_box_row_set_selected (row, TRUE); gtk_list_box_row_set_selected (row, TRUE);
priv->selected_row = row; priv->selected_row = row;
g_signal_emit (box, signals[ROW_SELECTED], 0, row); g_signal_emit (box, signals[ROW_SELECTED], 0, row);
} }
else else
gtk_list_box_select_all_between (box, priv->selected_row, row, FALSE); gtk_list_box_select_all_between (box, selected_row, row, FALSE);
} }
else else
{ {
@ -1904,7 +1906,6 @@ gtk_list_box_multipress_gesture_released (GtkGestureMultiPress *gesture,
gboolean extend; gboolean extend;
get_current_selection_modifiers (GTK_WIDGET (box), &modify, &extend); get_current_selection_modifiers (GTK_WIDGET (box), &modify, &extend);
/* With touch, we default to modifying the selection. /* With touch, we default to modifying the selection.
* You can still clear the selection and start over * You can still clear the selection and start over
* by holding Ctrl. * by holding Ctrl.