-/* GAIL - The GNOME Accessibility Implementation Library
+/* GTK+ - accessibility implementations
* Copyright 2001, 2002, 2003 Sun Microsystems Inc.
*
* This library is free software; you can redistribute it and/or
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include "gtktreeprivate.h"
#include "gtkwidgetprivate.h"
-#include "gtktreeviewaccessible.h"
+#include "gtktreeviewaccessibleprivate.h"
+
#include "gtkrenderercellaccessible.h"
#include "gtkbooleancellaccessible.h"
#include "gtkimagecellaccessible.h"
#include "gtkcontainercellaccessible.h"
#include "gtktextcellaccessible.h"
#include "gtkcellaccessibleparent.h"
+#include "gtkcellaccessibleprivate.h"
+
+struct _GtkTreeViewAccessiblePrivate
+{
+ GHashTable *cell_infos;
+};
typedef struct _GtkTreeViewAccessibleCellInfo GtkTreeViewAccessibleCellInfo;
struct _GtkTreeViewAccessibleCellInfo
static gboolean is_cell_showing (GtkTreeView *tree_view,
GdkRectangle *cell_rect);
-static void cell_info_new (GtkTreeViewAccessible *accessible,
- GtkTreeModel *tree_model,
+static void cell_info_new (GtkTreeViewAccessible *accessible,
GtkRBTree *tree,
GtkRBNode *node,
GtkTreeViewColumn *tv_col,
GtkCellAccessible *cell);
static gint get_column_number (GtkTreeView *tree_view,
GtkTreeViewColumn *column);
-static gint get_index (GtkTreeView *tree_view,
- GtkTreePath *path,
- gint actual_column);
-static void count_rows (GtkTreeModel *model,
- GtkTreeIter *iter,
- GtkTreePath *end_path,
- gint *count,
- gint level,
- gint depth);
static gboolean get_rbtree_column_from_index (GtkTreeView *tree_view,
gint index,
static void atk_component_interface_init (AtkComponentIface *iface);
static void gtk_cell_accessible_parent_interface_init (GtkCellAccessibleParentIface *iface);
-G_DEFINE_TYPE_WITH_CODE (GtkTreeViewAccessible, _gtk_tree_view_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE,
+G_DEFINE_TYPE_WITH_CODE (GtkTreeViewAccessible, gtk_tree_view_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_TABLE, atk_table_interface_init)
G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init)
G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init)
static void
cell_info_free (GtkTreeViewAccessibleCellInfo *cell_info)
{
+ gtk_accessible_set_widget (GTK_ACCESSIBLE (cell_info->cell), NULL);
g_object_unref (cell_info->cell);
g_free (cell_info);
GtkTreeModel *tree_model;
GtkWidget *widget;
- ATK_OBJECT_CLASS (_gtk_tree_view_accessible_parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gtk_tree_view_accessible_parent_class)->initialize (obj, data);
accessible = GTK_TREE_VIEW_ACCESSIBLE (obj);
- accessible->focus_cell = NULL;
- accessible->cell_infos = g_hash_table_new_full (cell_info_hash,
+ accessible->priv->cell_infos = g_hash_table_new_full (cell_info_hash,
cell_info_equal, NULL, (GDestroyNotify) cell_info_free);
widget = GTK_WIDGET (data);
{
GtkTreeViewAccessible *accessible = GTK_TREE_VIEW_ACCESSIBLE (object);
- if (accessible->cell_infos)
- g_hash_table_destroy (accessible->cell_infos);
+ if (accessible->priv->cell_infos)
+ g_hash_table_destroy (accessible->priv->cell_infos);
- G_OBJECT_CLASS (_gtk_tree_view_accessible_parent_class)->finalize (object);
+ G_OBJECT_CLASS (gtk_tree_view_accessible_parent_class)->finalize (object);
}
static void
AtkRole role;
tree_model = gtk_tree_view_get_model (tree_view);
- g_hash_table_remove_all (accessible->cell_infos);
+ g_hash_table_remove_all (accessible->priv->cell_infos);
if (tree_model)
{
g_object_thaw_notify (G_OBJECT (accessible));
}
else
- GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_tree_view_accessible_parent_class)->notify_gtk (obj, pspec);
+ GTK_WIDGET_ACCESSIBLE_CLASS (gtk_tree_view_accessible_parent_class)->notify_gtk (obj, pspec);
}
static void
{
GtkTreeViewAccessible *accessible = GTK_TREE_VIEW_ACCESSIBLE (gtkaccessible);
- if (accessible->focus_cell)
- {
- g_object_unref (accessible->focus_cell);
- accessible->focus_cell = NULL;
- }
+ g_hash_table_remove_all (accessible->priv->cell_infos);
- GTK_ACCESSIBLE_CLASS (_gtk_tree_view_accessible_parent_class)->widget_unset (gtkaccessible);
+ GTK_ACCESSIBLE_CLASS (gtk_tree_view_accessible_parent_class)->widget_unset (gtkaccessible);
}
static gint
return visible_columns;
}
+
static gint
gtk_tree_view_accessible_get_n_children (AtkObject *obj)
{
lookup.node = node;
lookup.cell_col_ref = column;
- cell_info = g_hash_table_lookup (accessible->cell_infos, &lookup);
+ cell_info = g_hash_table_lookup (accessible->priv->cell_infos, &lookup);
if (cell_info == NULL)
return NULL;
return cell_info->cell;
}
-static AtkObject *
-gtk_tree_view_accessible_ref_child (AtkObject *obj,
- gint i)
+static GtkCellAccessible *
+create_cell (GtkTreeView *treeview,
+ GtkTreeViewAccessible *accessible,
+ GtkRBTree *tree,
+ GtkRBNode *node,
+ GtkTreeViewColumn *column)
{
- GtkWidget *widget;
- GtkTreeViewAccessible *accessible;
- GtkCellAccessible *cell;
- GtkTreeView *tree_view;
- GtkTreeModel *tree_model;
GtkCellRenderer *renderer;
- GtkTreeViewColumn *tv_col;
- GtkTreePath *path;
- GtkRBTree *tree;
- GtkRBNode *node;
- AtkObject *child;
AtkObject *parent;
GList *renderer_list;
GList *l;
GtkContainerCellAccessible *container = NULL;
+ GtkCellAccessible *cell;
- widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
- if (widget == NULL)
- return NULL;
-
- if (i >= gtk_tree_view_accessible_get_n_children (obj))
- return NULL;
-
- accessible = GTK_TREE_VIEW_ACCESSIBLE (obj);
- tree_view = GTK_TREE_VIEW (widget);
- if (i < get_n_columns (tree_view))
- {
- tv_col = get_visible_column (tree_view, i);
- child = get_header_from_column (tv_col);
- if (child)
- g_object_ref (child);
- return child;
- }
-
- /* Find the RBTree and GtkTreeViewColumn for the index */
- 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)
- return g_object_ref (cell);
-
- path = _gtk_tree_path_new_from_rbtree (tree, node);
- tree_model = gtk_tree_view_get_model (tree_view);
-
- renderer_list = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (tv_col));
+ renderer_list = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (column));
/* If there is not exactly one renderer in the list,
* make a container
{
GtkCellAccessible *container_cell;
- container = _gtk_container_cell_accessible_new ();
+ container = gtk_container_cell_accessible_new ();
container_cell = GTK_CELL_ACCESSIBLE (container);
- _gtk_cell_accessible_initialise (container_cell, widget, ATK_OBJECT (accessible));
+ _gtk_cell_accessible_initialize (container_cell, GTK_WIDGET (treeview), ATK_OBJECT (accessible));
/* The GtkTreeViewAccessibleCellInfo structure for the container will
* be before the ones for the cells so that the first one we find for
* a position will be for the container
*/
- cell_info_new (accessible, tree_model, tree, node, tv_col, container_cell);
+ cell_info_new (accessible, tree, node, column, container_cell);
parent = ATK_OBJECT (container);
}
else
parent = ATK_OBJECT (accessible);
- child = NULL;
+ cell = NULL;
for (l = renderer_list; l; l = l->next)
{
renderer = GTK_CELL_RENDERER (l->data);
- child = _gtk_renderer_cell_accessible_new (renderer);
-
- cell = GTK_CELL_ACCESSIBLE (child);
+ cell = GTK_CELL_ACCESSIBLE (gtk_renderer_cell_accessible_new (renderer));
/* Create the GtkTreeViewAccessibleCellInfo for this cell */
if (parent == ATK_OBJECT (accessible))
- cell_info_new (accessible, tree_model, tree, node, tv_col, cell);
+ cell_info_new (accessible, tree, node, column, cell);
- _gtk_cell_accessible_initialise (cell, widget, parent);
+ _gtk_cell_accessible_initialize (cell, GTK_WIDGET (treeview), parent);
if (container)
- _gtk_container_cell_accessible_add_child (container, cell);
+ gtk_container_cell_accessible_add_child (container, cell);
}
g_list_free (renderer_list);
if (container)
- child = ATK_OBJECT (container);
+ cell = GTK_CELL_ACCESSIBLE (container);
- set_cell_data (tree_view, accessible, GTK_CELL_ACCESSIBLE (child));
- _gtk_cell_accessible_update_cache (GTK_CELL_ACCESSIBLE (child));
+ set_cell_data (treeview, accessible, cell);
+ _gtk_cell_accessible_update_cache (cell);
- if (gtk_tree_view_get_expander_column (tree_view) == tv_col)
+ if (gtk_tree_view_get_expander_column (treeview) == column)
{
AtkRelationSet *relation_set;
- AtkObject *accessible_array[1];
AtkRelation* relation;
AtkObject *parent_node;
- relation_set = atk_object_ref_relation_set (ATK_OBJECT (child));
+ relation_set = atk_object_ref_relation_set (ATK_OBJECT (cell));
- gtk_tree_path_up (path);
- if (gtk_tree_path_get_depth (path) == 0)
- parent_node = obj;
- else
+ if (tree->parent_tree)
{
- gint parent_index;
-
- parent_index = get_index (tree_view, path, i % get_n_columns (tree_view));
- parent_node = atk_object_ref_accessible_child (obj, parent_index);
+ parent_node = ATK_OBJECT (peek_cell (accessible, tree->parent_tree, tree->parent_node, column));
+ if (parent_node == NULL)
+ parent_node = ATK_OBJECT (create_cell (treeview, accessible, tree->parent_tree, tree->parent_node, column));
}
- accessible_array[0] = parent_node;
- relation = atk_relation_new (accessible_array, 1,
- ATK_RELATION_NODE_CHILD_OF);
+ else
+ parent_node = ATK_OBJECT (accessible);
+ relation = atk_relation_new (&parent_node, 1, ATK_RELATION_NODE_CHILD_OF);
atk_relation_set_add (relation_set, relation);
- atk_object_add_relationship (parent_node, ATK_RELATION_NODE_PARENT_OF, child);
+ atk_object_add_relationship (parent_node, ATK_RELATION_NODE_PARENT_OF, ATK_OBJECT (cell));
g_object_unref (relation);
g_object_unref (relation_set);
}
- gtk_tree_path_free (path);
- return child;
+ return cell;
+}
+
+static AtkObject *
+gtk_tree_view_accessible_ref_child (AtkObject *obj,
+ gint i)
+{
+ GtkWidget *widget;
+ GtkTreeViewAccessible *accessible;
+ GtkCellAccessible *cell;
+ GtkTreeView *tree_view;
+ GtkTreeViewColumn *tv_col;
+ GtkRBTree *tree;
+ GtkRBNode *node;
+ AtkObject *child;
+
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
+ if (widget == NULL)
+ return NULL;
+
+ if (i >= gtk_tree_view_accessible_get_n_children (obj))
+ return NULL;
+
+ accessible = GTK_TREE_VIEW_ACCESSIBLE (obj);
+ tree_view = GTK_TREE_VIEW (widget);
+ if (i < get_n_columns (tree_view))
+ {
+ tv_col = get_visible_column (tree_view, i);
+ child = get_header_from_column (tv_col);
+ if (child)
+ g_object_ref (child);
+ return child;
+ }
+
+ /* Find the RBTree and GtkTreeViewColumn for the index */
+ 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 == NULL)
+ cell = create_cell (tree_view, accessible, tree, node, tv_col);
+
+ return g_object_ref (cell);
}
static AtkStateSet*
AtkStateSet *state_set;
GtkWidget *widget;
- state_set = ATK_OBJECT_CLASS (_gtk_tree_view_accessible_parent_class)->ref_state_set (obj);
+ state_set = ATK_OBJECT_CLASS (gtk_tree_view_accessible_parent_class)->ref_state_set (obj);
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
if (widget != NULL)
}
static void
-_gtk_tree_view_accessible_class_init (GtkTreeViewAccessibleClass *klass)
+gtk_tree_view_accessible_class_init (GtkTreeViewAccessibleClass *klass)
{
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
container_class->remove_gtk = NULL;
gobject_class->finalize = gtk_tree_view_accessible_finalize;
+
+ g_type_class_add_private (klass, sizeof (GtkTreeViewAccessiblePrivate));
}
static void
-_gtk_tree_view_accessible_init (GtkTreeViewAccessible *view)
+gtk_tree_view_accessible_init (GtkTreeViewAccessible *view)
{
+ view->priv = G_TYPE_INSTANCE_GET_PRIVATE (view,
+ GTK_TYPE_TREE_VIEW_ACCESSIBLE,
+ GtkTreeViewAccessiblePrivate);
}
/* atkcomponent.h */
GtkWidget *widget;
GtkTreeView *tree_view;
GtkTreePath *path;
- GtkTreeViewColumn *tv_column;
+ GtkTreeViewColumn *column;
gint x_pos, y_pos;
gint bx, by;
- gboolean ret_val;
+ GtkCellAccessible *cell;
+ GtkRBTree *tree;
+ GtkRBNode *node;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (component));
if (widget == NULL)
atk_component_get_extents (component, &x_pos, &y_pos, NULL, NULL, coord_type);
gtk_tree_view_convert_widget_to_bin_window_coords (tree_view, x, y, &bx, &by);
- ret_val = gtk_tree_view_get_path_at_pos (tree_view,
- bx - x_pos, by - y_pos,
- &path, &tv_column, NULL, NULL);
- if (ret_val)
- {
- gint index, column;
+ if (!gtk_tree_view_get_path_at_pos (tree_view,
+ bx - x_pos, by - y_pos,
+ &path, &column, NULL, NULL))
+ return NULL;
- column = get_column_number (tree_view, tv_column);
- index = get_index (tree_view, path, column);
+ if (_gtk_tree_view_find_node (tree_view, path, &tree, &node))
+ {
gtk_tree_path_free (path);
-
- return gtk_tree_view_accessible_ref_child (ATK_OBJECT (component), index);
+ return NULL;
}
- return NULL;
+ cell = peek_cell (GTK_TREE_VIEW_ACCESSIBLE (component), tree, node, column);
+ if (cell == NULL)
+ cell = create_cell (tree_view, GTK_TREE_VIEW_ACCESSIBLE (component), tree, node, column);
+
+ return g_object_ref (cell);
}
static void
static void
cell_info_new (GtkTreeViewAccessible *accessible,
- GtkTreeModel *tree_model,
GtkRBTree *tree,
GtkRBNode *node,
GtkTreeViewColumn *tv_col,
gtk_tree_view_accessible_get_data_quark (),
cell_info);
- g_hash_table_replace (accessible->cell_infos, cell_info, cell_info);
+ g_hash_table_replace (accessible->priv->cell_infos, cell_info, cell_info);
}
/* Returns the column number of the specified GtkTreeViewColumn
return number;
}
-static gint
-get_index (GtkTreeView *tree_view,
- GtkTreePath *path,
- gint actual_column)
-{
- gint depth = 0;
- gint index = 1;
- gint *indices = NULL;
-
- if (path)
- {
- depth = gtk_tree_path_get_depth (path);
- indices = gtk_tree_path_get_indices (path);
- }
-
- if (depth > 1)
- {
- GtkTreePath *copy_path;
- GtkTreeModel *model;
-
- model = gtk_tree_view_get_model (tree_view);
- copy_path = gtk_tree_path_copy (path);
- gtk_tree_path_up (copy_path);
- count_rows (model, NULL, copy_path, &index, 0, depth);
- gtk_tree_path_free (copy_path);
- }
-
- if (path)
- index += indices[depth - 1];
- index *= get_n_columns (tree_view);
- index += actual_column;
- return index;
-}
-
-/* The function count_rows counts the number of rows starting at iter
- * and ending at end_path. The value of level is the depth of iter and
- * the value of depth is the depth of end_path. Rows at depth before
- * end_path are counted. This functions counts rows which are not visible
- * because an ancestor is collapsed.
- */
-static void
-count_rows (GtkTreeModel *model,
- GtkTreeIter *iter,
- GtkTreePath *end_path,
- gint *count,
- gint level,
- gint depth)
-{
- GtkTreeIter child_iter;
-
- if (!model)
- return;
-
- level++;
- *count += gtk_tree_model_iter_n_children (model, iter);
-
- if (gtk_tree_model_get_flags (model) & GTK_TREE_MODEL_LIST_ONLY)
- return;
-
- if (level >= depth)
- return;
-
- if (gtk_tree_model_iter_children (model, &child_iter, iter))
- {
- gboolean ret_val = TRUE;
-
- while (ret_val)
- {
- if (level == depth - 1)
- {
- GtkTreePath *iter_path;
- gboolean finished = FALSE;
-
- iter_path = gtk_tree_model_get_path (model, &child_iter);
- if (end_path && gtk_tree_path_compare (iter_path, end_path) >= 0)
- finished = TRUE;
- gtk_tree_path_free (iter_path);
- if (finished)
- break;
- }
- if (gtk_tree_model_iter_has_child (model, &child_iter))
- count_rows (model, &child_iter, end_path, count, level, depth);
- ret_val = gtk_tree_model_iter_next (model, &child_iter);
- }
- }
-}
-
static gboolean
get_rbtree_column_from_index (GtkTreeView *tree_view,
gint index,
g_signal_emit_by_name (accessible, "children-changed::remove", i, NULL, NULL);
}
- g_hash_table_iter_init (&iter, accessible->cell_infos);
+ g_hash_table_iter_init (&iter, accessible->priv->cell_infos);
while (g_hash_table_iter_next (&iter, NULL, (gpointer *)&cell_info))
{
if (node == cell_info->node ||
return id - invisible;
}
-void
-_gtk_tree_view_accessible_do_add_column (GtkTreeViewAccessible *accessible,
- GtkTreeView *treeview,
- GtkTreeViewColumn *column,
- guint id)
+static void
+gtk_tree_view_accessible_do_add_column (GtkTreeViewAccessible *accessible,
+ GtkTreeView *treeview,
+ GtkTreeViewColumn *column,
+ guint id)
{
guint row, n_rows, n_cols;
if (obj == NULL)
return;
- _gtk_tree_view_accessible_do_add_column (GTK_TREE_VIEW_ACCESSIBLE (obj),
- treeview,
- column,
- to_visible_column_id (treeview, id));
+ gtk_tree_view_accessible_do_add_column (GTK_TREE_VIEW_ACCESSIBLE (obj),
+ treeview,
+ column,
+ to_visible_column_id (treeview, id));
}
-void
-_gtk_tree_view_accessible_do_remove_column (GtkTreeViewAccessible *accessible,
- GtkTreeView *treeview,
- GtkTreeViewColumn *column,
- guint id)
+static void
+gtk_tree_view_accessible_do_remove_column (GtkTreeViewAccessible *accessible,
+ GtkTreeView *treeview,
+ GtkTreeViewColumn *column,
+ guint id)
{
GtkTreeViewAccessibleCellInfo *cell_info;
GHashTableIter iter;
guint row, n_rows, n_cols;
/* Clean column from cache */
- g_hash_table_iter_init (&iter, accessible->cell_infos);
+ g_hash_table_iter_init (&iter, accessible->priv->cell_infos);
while (g_hash_table_iter_next (&iter, NULL, &value))
{
cell_info = value;
if (obj == NULL)
return;
- _gtk_tree_view_accessible_do_remove_column (GTK_TREE_VIEW_ACCESSIBLE (obj),
- treeview,
- column,
- to_visible_column_id (treeview, id));
+ gtk_tree_view_accessible_do_remove_column (GTK_TREE_VIEW_ACCESSIBLE (obj),
+ treeview,
+ column,
+ to_visible_column_id (treeview, id));
}
void
GtkTreeViewColumn *column)
{
AtkObject *obj;
- guint id;
+ guint i, id;
obj = _gtk_widget_peek_accessible (GTK_WIDGET (treeview));
if (obj == NULL)
return;
- id = get_column_number (treeview, column);
-
if (gtk_tree_view_column_get_visible (column))
- _gtk_tree_view_accessible_do_add_column (GTK_TREE_VIEW_ACCESSIBLE (obj),
- treeview,
- column,
- id);
+ {
+ id = get_column_number (treeview, column);
+
+ gtk_tree_view_accessible_do_add_column (GTK_TREE_VIEW_ACCESSIBLE (obj),
+ treeview,
+ column,
+ id);
+ }
else
- _gtk_tree_view_accessible_do_remove_column (GTK_TREE_VIEW_ACCESSIBLE (obj),
- treeview,
- column,
- id);
+ {
+ id = 0;
+
+ for (i = 0; i < gtk_tree_view_get_n_columns (treeview); i++)
+ {
+ GtkTreeViewColumn *cur = gtk_tree_view_get_column (treeview, i);
+
+ if (gtk_tree_view_column_get_visible (cur))
+ id++;
+
+ if (cur == column)
+ break;
+ }
+
+ gtk_tree_view_accessible_do_remove_column (GTK_TREE_VIEW_ACCESSIBLE (obj),
+ treeview,
+ column,
+ id);
+ }
}
-GtkTreeViewColumn *
+static GtkTreeViewColumn *
get_effective_focus_column (GtkTreeView *treeview,
GtkTreeViewColumn *column)
{
if (new_focus)
{
- /* XXX: force creation here */
cell = peek_cell (accessible, cursor_tree, cursor_node, new_focus);
if (cell != NULL)
- {
- _gtk_cell_accessible_state_changed (cell, 0, GTK_CELL_RENDERER_FOCUSED);
- g_signal_emit_by_name (accessible, "active-descendant-changed", cell);
- }
+ _gtk_cell_accessible_state_changed (cell, 0, GTK_CELL_RENDERER_FOCUSED);
+ else
+ cell = create_cell (treeview, accessible, cursor_tree, cursor_node, new_focus);
+
+ g_signal_emit_by_name (accessible, "active-descendant-changed", cell);
}
}
GtkCellRendererState state)
{
GtkTreeViewAccessible *accessible;
+ GtkTreeViewColumn *single_column;
AtkObject *obj;
guint i;
if (state == GTK_CELL_RENDERER_FOCUSED)
{
- GtkTreeViewColumn *focus_column;
-
- focus_column = get_effective_focus_column (treeview, _gtk_tree_view_get_focus_column (treeview));
-
- if (focus_column)
- {
- /* XXX: force creation here */
- GtkCellAccessible *cell = peek_cell (accessible,
- tree, node,
- focus_column);
-
- if (cell != NULL)
- {
- _gtk_cell_accessible_state_changed (cell, 0, state);
- g_signal_emit_by_name (accessible, "active-descendant-changed", cell);
- }
- }
-
- return;
+ single_column = get_effective_focus_column (treeview, _gtk_tree_view_get_focus_column (treeview));
}
+ else if (state == GTK_CELL_RENDERER_EXPANDED ||
+ state == GTK_CELL_RENDERER_EXPANDABLE)
+ {
+ single_column = gtk_tree_view_get_expander_column (treeview);
+ }
+ else
+ single_column = NULL;
- for (i = 0; i < gtk_tree_view_get_n_columns (treeview); i++)
+ if (single_column)
{
GtkCellAccessible *cell = peek_cell (accessible,
tree, node,
- gtk_tree_view_get_column (treeview, i));
+ single_column);
- if (cell == NULL)
- continue;
+ if (cell != NULL)
+ _gtk_cell_accessible_state_changed (cell, state, 0);
- _gtk_cell_accessible_state_changed (cell, state, 0);
+ if (state == GTK_CELL_RENDERER_FOCUSED)
+ {
+ if (cell == NULL)
+ cell = create_cell (treeview, accessible, tree, node, single_column);
+
+ g_signal_emit_by_name (accessible, "active-descendant-changed", cell);
+ }
+ }
+ else
+ {
+ for (i = 0; i < gtk_tree_view_get_n_columns (treeview); i++)
+ {
+ GtkCellAccessible *cell = peek_cell (accessible,
+ tree, node,
+ gtk_tree_view_get_column (treeview, i));
+
+ if (cell == NULL)
+ continue;
+
+ _gtk_cell_accessible_state_changed (cell, state, 0);
+ }
}
if (state == GTK_CELL_RENDERER_SELECTED)
GtkCellRendererState state)
{
GtkTreeViewAccessible *accessible;
+ GtkTreeViewColumn *single_column;
AtkObject *obj;
guint i;
if (state == GTK_CELL_RENDERER_FOCUSED)
{
- GtkTreeViewColumn *focus_column;
-
- focus_column = get_effective_focus_column (treeview, _gtk_tree_view_get_focus_column (treeview));
-
- if (focus_column)
- {
- GtkCellAccessible *cell = peek_cell (accessible,
- tree, node,
- focus_column);
-
- if (cell != NULL)
- _gtk_cell_accessible_state_changed (cell, 0, state);
- }
-
- return;
+ single_column = get_effective_focus_column (treeview, _gtk_tree_view_get_focus_column (treeview));
}
+ else if (state == GTK_CELL_RENDERER_EXPANDED ||
+ state == GTK_CELL_RENDERER_EXPANDABLE)
+ {
+ single_column = gtk_tree_view_get_expander_column (treeview);
+ }
+ else
+ single_column = NULL;
- for (i = 0; i < gtk_tree_view_get_n_columns (treeview); i++)
+ if (single_column)
{
GtkCellAccessible *cell = peek_cell (accessible,
tree, node,
- gtk_tree_view_get_column (treeview, i));
+ single_column);
- if (cell == NULL)
- continue;
+ if (cell != NULL)
+ _gtk_cell_accessible_state_changed (cell, 0, state);
+ }
+ else
+ {
+ for (i = 0; i < gtk_tree_view_get_n_columns (treeview); i++)
+ {
+ GtkCellAccessible *cell = peek_cell (accessible,
+ tree, node,
+ gtk_tree_view_get_column (treeview, i));
+
+ if (cell == NULL)
+ continue;
- _gtk_cell_accessible_state_changed (cell, 0, state);
+ _gtk_cell_accessible_state_changed (cell, 0, state);
+ }
}
if (state == GTK_CELL_RENDERER_SELECTED)
projects / ~andy / gtk / blobdiff