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

Separate sensitive/selectable properties.

Browse Source 
2006-06-02  Kristian Rietveld  <kris@imendio.com>

	Separate sensitive/selectable properties.

	* gtk/gtktreeselection.c (tree_column_is_sensitive): remove,
	(_gtk_tree_selection_row_is_selectable): remove checks to see if at
	least one column is sensitive,
	(gtk_tree_selection_real_select_node): remove code which enables
	insensitive rows to always be unselected.

	* gtk/gtktreeview.c (gtk_tree_view_row_changed): remove code
	that unselects a node if it just became insensitive.

	* gtk/gtkcombobox.c (gtkcombo_box_list_select_func): new function,
	based on the at least one column sensitive check from
	_gtk_tree_selection_row_is_selectable(),
	(gtk_combo_box_list_setup): set selection function on tree selection.
This commit is contained in:
Kristian Rietveld
2006-06-02 18:55:59 +00:00
committed by Kristian Rietveld
parent 3180e45356
commit a70e666423
5 changed files with 90 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
gtk/gtktreeselection.c
View File

@ -1231,44 +1231,11 @@ gtk_tree_selection_unselect_range (GtkTreeSelection *selection,
g_signal_emit (selection, tree_selection_signals[CHANGED], 0);
}
static gboolean
tree_column_is_sensitive (GtkTreeViewColumn *column,
GtkTreeModel *model,
GtkTreeIter *iter)
{
GList *cells, *list;
gboolean sensitive;
gboolean visible;
gtk_tree_view_column_cell_set_cell_data (column, model,
iter, FALSE, FALSE);
cells = gtk_tree_view_column_get_cell_renderers (column);
list = cells;
while (list)
{
g_object_get (list->data,
"sensitive", &sensitive,
"visible", &visible,
NULL);
if (visible && sensitive)
break;
list = list->next;
}
g_list_free (cells);
return sensitive;
}
gboolean
_gtk_tree_selection_row_is_selectable (GtkTreeSelection *selection,
GtkRBNode *node,
GtkTreePath *path)
{
GList *list;
GtkTreeIter iter;
gboolean sensitive = FALSE;
@ -1284,19 +1251,6 @@ _gtk_tree_selection_row_is_selectable (GtkTreeSelection *selection,
return FALSE;
}
for (list = selection->tree_view->priv->columns; list && !sensitive; list = list->next)
{
GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN (list->data);
if (!column->visible)
continue;
sensitive = tree_column_is_sensitive (column, selection->tree_view->priv->model, &iter);
}
if (!sensitive)
return FALSE;
if (selection->user_func)
return (*selection->user_func) (selection, selection->tree_view->priv->model, path,
GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED),
@ -1479,10 +1433,7 @@ gtk_tree_selection_real_select_node (GtkTreeSelection *selection,
if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED) != select)
{
path = _gtk_tree_view_find_path (selection->tree_view, tree, node);
if (!select)
toggle = TRUE;
else
toggle = _gtk_tree_selection_row_is_selectable (selection, node, path);
toggle = _gtk_tree_selection_row_is_selectable (selection, node, path);
gtk_tree_path_free (path);
}