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

Remove gtk_selection_model_user_select_item() again

Browse Source 
This reverts commit 6a164ab306dad9096bde736c907494c71086d3c4.

The function was awkward and we now have only one caller again, so we
can fold it back into it.
This commit is contained in:
Benjamin Otte 2019-10-24 02:14:34 +02:00 committed by Matthias Clasen
parent 2541037ec2
commit dd5e6d47db
4 changed files with 60 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/gtk/gtk4-sections.txt
View File

@ -352,8 +352,6 @@ gtk_selection_model_select_all
gtk_selection_model_unselect_all
gtk_selection_model_query_range
<SUBSECTION>
gtk_selection_model_user_select_item
<SUBSECTION>
gtk_selection_model_selection_changed
<SUBSECTION Standard>
GTK_SELECTION_MODEL

69
gtk/gtklistbase.c
View File

@ -116,22 +116,73 @@ gtk_list_base_select_item (GtkListBase *self,
{
GtkListBasePrivate *priv = gtk_list_base_get_instance_private (self);
GtkSelectionModel *model;
gboolean success = FALSE;
guint n_items;
model = gtk_list_item_manager_get_model (priv->item_manager);
if (model == NULL)
return;
if (gtk_selection_model_user_select_item (model,
pos,
modify,
extend ? gtk_list_item_tracker_get_position (priv->item_manager, priv->selected)
: GTK_INVALID_LIST_POSITION))
n_items = g_list_model_get_n_items (G_LIST_MODEL (model));
if (pos >= n_items)
return;
if (extend)
{
gtk_list_item_tracker_set_position (priv->item_manager,
priv->selected,
pos,
0, 0);
guint extend_pos = gtk_list_item_tracker_get_position (priv->item_manager, priv->selected);
if (extend_pos < n_items)
{
guint max = MAX (extend_pos, pos);
guint min = MIN (extend_pos, pos);
if (modify)
{
if (gtk_selection_model_is_selected (model, extend_pos))
{
success = gtk_selection_model_select_range (model,
min,
max - min + 1,
FALSE);
}
else
{
success = gtk_selection_model_unselect_range (model,
min,
max - min + 1);
}
}
else
{
success = gtk_selection_model_select_range (model,
min,
max - min + 1,
TRUE);
}
}
/* If there's no range to select or selecting ranges isn't supported
* by the model, fall through to normal setting.
*/
}
if (success)
return;
if (modify)
{
if (gtk_selection_model_is_selected (model, pos))
success = gtk_selection_model_unselect_item (model, pos);
else
success = gtk_selection_model_select_item (model, pos, FALSE);
}
else
{
success = gtk_selection_model_select_item (model, pos, TRUE);
}
gtk_list_item_tracker_set_position (priv->item_manager,
priv->selected,
pos,
0, 0);
}
static void

87
gtk/gtkselectionmodel.c
View File

@ -382,90 +382,3 @@ gtk_selection_model_selection_changed (GtkSelectionModel *model,
g_signal_emit (model, signals[SELECTION_CHANGED], 0, position, n_items);
}
/**
* gtk_selection_model_user_select_item:
* @self: a #GtkSelectionModel
* @pos: position selected by the user. If this position is invalid
* no selection will be done.
* @modify: %TRUE if the selection should be modified, %FALSE
* if a new selection should be done. This is usually set
* to %TRUE if the user keeps the <Shift> key pressed.
* @extend_pos: the position to extend the selection from or
* an invalid position like #GTK_INVALID_LIST_POSITION to not
* extend the selection. Selections are usually extended
* from the last selected position if the user presses the
* <Ctrl> key. The last selected position is stored by the
* widget
*
* Does a selection according to how GTK list widgets modify
* selections, both when clicking rows with the mouse or when using
* the keyboard.
*
* Returns: %TRUE if the last selected position for further calls
* to this function should be updated to @pos, %FALSE if the
* last selected position should not change.
**/
gboolean
gtk_selection_model_user_select_item (GtkSelectionModel *self,
guint pos,
gboolean modify,
guint extend_pos)
{
gboolean success = FALSE;
guint n_items;
g_return_val_if_fail (GTK_IS_SELECTION_MODEL (self), FALSE);
n_items = g_list_model_get_n_items (G_LIST_MODEL (self));
if (pos >= n_items)
return FALSE;
if (extend_pos < n_items)
{
guint max = MAX (extend_pos, pos);
guint min = MIN (extend_pos, pos);
if (modify)
{
if (gtk_selection_model_is_selected (self, extend_pos))
{
success = gtk_selection_model_select_range (self,
min,
max - min + 1,
FALSE);
}
else
{
success = gtk_selection_model_unselect_range (self,
min,
max - min + 1);
}
}
else
{
success = gtk_selection_model_select_range (self,
min,
max - min + 1,
TRUE);
}
/* If there's no range to select or selecting ranges isn't supported
* by the model, fall through to normal setting.
*/
}
if (success)
return FALSE;
if (modify)
{
if (gtk_selection_model_is_selected (self, pos))
success = gtk_selection_model_unselect_item (self, pos);
else
success = gtk_selection_model_select_item (self, pos, FALSE);
}
else
{
success = gtk_selection_model_select_item (self, pos, TRUE);
}
return success;
}

5
gtk/gtkselectionmodel.h
View File

@ -118,11 +118,6 @@ void gtk_selection_model_query_range (GtkSelectionMod
guint *n_items,
gboolean *selected);
GDK_AVAILABLE_IN_ALL
gboolean gtk_selection_model_user_select_item (GtkSelectionModel *self,
guint pos,
gboolean modify,
guint extend_pos);
/* for implementations only */
GDK_AVAILABLE_IN_ALL
void gtk_selection_model_selection_changed (GtkSelectionModel *model,