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

a11y: Add a special-case for cell index querying

Browse Source 
I could have tried to make GtkContainerCellAccessible implement
GtkCellAccessibleParent, but the current implementation of that
interface doesn't make sense for it.
This commit is contained in:
Benjamin Otte 2011-11-11 01:25:09 +01:00
parent 02fd1e5a62
commit 533ee181de
2 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/a11y/gtkcellaccessible.c
View File

@ -95,6 +95,11 @@ gtk_cell_accessible_get_index_in_parent (AtkObject *obj)
int index; int index;
cell = GTK_CELL_ACCESSIBLE (obj); cell = GTK_CELL_ACCESSIBLE (obj);
parent = atk_object_get_parent (obj);
if (GTK_IS_CONTAINER_CELL_ACCESSIBLE (parent))
return g_list_index (GTK_CONTAINER_CELL_ACCESSIBLE (parent)->children, obj);
parent = gtk_widget_get_accessible (cell->widget); parent = gtk_widget_get_accessible (cell->widget);
if (parent == NULL) if (parent == NULL)
return -1; return -1;

25
gtk/a11y/gtkcontainercellaccessible.c
View File

@ -96,29 +96,6 @@ _gtk_container_cell_accessible_new (void)
return container; return container;
} }
static void
recompute_child_indices (GtkContainerCellAccessible *container)
{
gint cur_index = 0;
GList *l;
for (l = container->children; l; l = l->next)
{
GTK_CELL_ACCESSIBLE (l->data)->index = cur_index;
cur_index++;
}
}
static void
refresh_child_index (GtkCellAccessible *cell)
{
AtkObject *parent;
parent = atk_object_get_parent (ATK_OBJECT (cell));
recompute_child_indices (GTK_CONTAINER_CELL_ACCESSIBLE (parent));
}
void void
_gtk_container_cell_accessible_add_child (GtkContainerCellAccessible *container, _gtk_container_cell_accessible_add_child (GtkContainerCellAccessible *container,
GtkCellAccessible *child) GtkCellAccessible *child)
@ -132,7 +109,6 @@ _gtk_container_cell_accessible_add_child (GtkContainerCellAccessible *container,
container->children = g_list_append (container->children, child); container->children = g_list_append (container->children, child);
child->index = child_index; child->index = child_index;
atk_object_set_parent (ATK_OBJECT (child), ATK_OBJECT (container)); atk_object_set_parent (ATK_OBJECT (child), ATK_OBJECT (container));
child->refresh_index = refresh_child_index;
} }
void void
@ -144,6 +120,5 @@ _gtk_container_cell_accessible_remove_child (GtkContainerCellAccessible *contain
g_return_if_fail (container->NChildren > 0); g_return_if_fail (container->NChildren > 0);
container->children = g_list_remove (container->children, child); container->children = g_list_remove (container->children, child);
recompute_child_indices (container);
container->NChildren--; container->NChildren--;
} }