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

a11y: Simplify code

Browse Source 
Use peek_cell() instead of a custom find_cell() function that duplicates
loads of functionality.
This commit is contained in:
Benjamin Otte
2011-12-16 23:11:45 +01:00
parent 19c5b5c9d6
commit e4f6a7124b
1 changed files with 25 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
gtk/a11y/gtktreeviewaccessible.c
View File

@ -66,8 +66,6 @@ static void cell_info_new (GtkTreeViewAccessible
GtkRBNode *node, GtkRBNode *node,
GtkTreeViewColumn *tv_col, GtkTreeViewColumn *tv_col,
GtkCellAccessible *cell); GtkCellAccessible *cell);
static GtkCellAccessible *find_cell (GtkTreeViewAccessible *accessible,
gint index);
static gint get_column_number (GtkTreeView *tree_view, static gint get_column_number (GtkTreeView *tree_view,
GtkTreeViewColumn *column); GtkTreeViewColumn *column);
static gint get_focus_index (GtkTreeView *tree_view); static gint get_focus_index (GtkTreeView *tree_view);
@ -387,6 +385,25 @@ set_cell_data (GtkTreeView *treeview,
is_expanded); is_expanded);
} }
static GtkCellAccessible *
peek_cell (GtkTreeViewAccessible *accessible,
GtkRBTree *tree,
GtkRBNode *node,
GtkTreeViewColumn *column)
{
GtkTreeViewAccessibleCellInfo lookup, *cell_info;
lookup.tree = tree;
lookup.node = node;
lookup.cell_col_ref = column;
cell_info = g_hash_table_lookup (accessible->cell_infos, &lookup);
if (cell_info == NULL)
return NULL;
return cell_info->cell;
}
static AtkObject * static AtkObject *
gtk_tree_view_accessible_ref_child (AtkObject *obj, gtk_tree_view_accessible_ref_child (AtkObject *obj,
gint i) gint i)
@ -426,23 +443,19 @@ gtk_tree_view_accessible_ref_child (AtkObject *obj,
return child; return child;
} }
/* Check whether the child is cached */ /* Find the RBTree and GtkTreeViewColumn for the index */
cell = find_cell (accessible, i); if (!get_rbtree_column_from_index (tree_view, i, &tree, &node, &tv_col))
return NULL;
cell = peek_cell (accessible, tree, node, tv_col);
if (cell) if (cell)
{ return g_object_ref (cell);
g_object_ref (cell);
return ATK_OBJECT (cell);
}
if (accessible->focus_cell == NULL) if (accessible->focus_cell == NULL)
focus_index = get_focus_index (tree_view); focus_index = get_focus_index (tree_view);
else else
focus_index = -1; focus_index = -1;
/* Find the RBTree and GtkTreeViewColumn for the index */
if (!get_rbtree_column_from_index (tree_view, i, &tree, &node, &tv_col))
return NULL;
path = _gtk_tree_path_new_from_rbtree (tree, node); path = _gtk_tree_path_new_from_rbtree (tree, node);
tree_model = gtk_tree_view_get_model (tree_view); tree_model = gtk_tree_view_get_model (tree_view);
@ -1624,48 +1637,6 @@ cell_info_new (GtkTreeViewAccessible *accessible,
g_hash_table_replace (accessible->cell_infos, cell_info, cell_info); g_hash_table_replace (accessible->cell_infos, cell_info, cell_info);
} }
static GtkCellAccessible *
peek_cell (GtkTreeViewAccessible *accessible,
GtkRBTree *tree,
GtkRBNode *node,
GtkTreeViewColumn *column)
{
GtkTreeViewAccessibleCellInfo lookup, *cell_info;
lookup.tree = tree;
lookup.node = node;
lookup.cell_col_ref = column;
cell_info = g_hash_table_lookup (accessible->cell_infos, &lookup);
if (cell_info == NULL)
return NULL;
return cell_info->cell;
}
static GtkCellAccessible *
find_cell (GtkTreeViewAccessible *accessible,
gint index)
{
GtkTreeView *tree_view;
GtkRBTree *tree;
GtkRBNode *node;
tree_view = GTK_TREE_VIEW (gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible)));
if (!_gtk_rbtree_find_index (_gtk_tree_view_get_rbtree (tree_view),
index / get_n_columns (tree_view) - 1,
&tree,
&node))
{
g_assert_not_reached ();
}
return peek_cell (accessible,
tree, node,
get_visible_column (tree_view, index % get_n_columns (tree_view)));
}
/* Returns the column number of the specified GtkTreeViewColumn /* Returns the column number of the specified GtkTreeViewColumn
* The column must be visible. * The column must be visible.
*/ */