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

treeview: Notify a11y about reordered rows

Browse Source 
That way, no more signal handler is needed in the a11y code. Plus, we
avoid needless signal emissions for rows we don't care about.
This commit is contained in:
Benjamin Otte 2011-11-23 03:21:57 +01:00
parent fbfbaa3d50
commit 416b3ed204
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/a11y/gtktreeviewaccessible.c
View File

@ -1995,19 +1995,14 @@ destroy_count_func (GtkTreeView *tree_view,
accessible->n_children_deleted = count;
}
static void
model_rows_reordered (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkTreeIter *iter,
gint *new_order,
gpointer user_data)
void
_gtk_tree_view_accessible_reorder (GtkTreeView *treeview)
{
GtkTreeView *tree_view = (GtkTreeView *)user_data;
AtkObject *atk_obj;
GtkTreeViewAccessible *accessible;
atk_obj = gtk_widget_get_accessible (GTK_WIDGET (tree_view));
accessible = GTK_TREE_VIEW_ACCESSIBLE (atk_obj);
accessible = GTK_TREE_VIEW_ACCESSIBLE (_gtk_widget_peek_accessible (GTK_WIDGET (treeview)));
if (accessible == NULL)
return;
if (accessible->idle_expand_id)
{
@ -2017,7 +2012,7 @@ model_rows_reordered (GtkTreeModel *tree_model,
}
traverse_cells (accessible, NULL, FALSE);
g_signal_emit_by_name (atk_obj, "row-reordered");
g_signal_emit_by_name (accessible, "row-reordered");
}
static void
@ -2781,9 +2776,6 @@ connect_model_signals (GtkTreeView *view,
g_signal_connect_data (obj, "row-deleted",
G_CALLBACK (model_row_deleted), view, NULL,
G_CONNECT_AFTER);
g_signal_connect_data (obj, "rows-reordered",
G_CALLBACK (model_rows_reordered), view, NULL,
G_CONNECT_AFTER);
}
static void
@ -2797,7 +2789,6 @@ disconnect_model_signals (GtkTreeViewAccessible *accessible)
g_signal_handlers_disconnect_by_func (obj, model_row_changed, widget);
g_signal_handlers_disconnect_by_func (obj, model_row_inserted, widget);
g_signal_handlers_disconnect_by_func (obj, model_row_deleted, widget);
g_signal_handlers_disconnect_by_func (obj, model_rows_reordered, widget);
}
/* Returns the column number of the specified GtkTreeViewColumn

1
gtk/a11y/gtktreeviewaccessible.h
View File

@ -57,6 +57,7 @@ struct _GtkTreeViewAccessibleClass
GType _gtk_tree_view_accessible_get_type (void);
/* called by treeview code */
void _gtk_tree_view_accessible_reorder (GtkTreeView *treeview);
void _gtk_tree_view_accessible_remove (GtkTreeView *treeview,
GtkRBTree *tree,
GtkRBNode *node);

2
gtk/gtktreeview.c
View File

@ -9113,6 +9113,8 @@ gtk_tree_view_rows_reordered (GtkTreeModel *model,
_gtk_rbtree_reorder (tree, new_order, len);
_gtk_tree_view_accessible_reorder (tree_view);
gtk_widget_queue_draw (GTK_WIDGET (tree_view));
gtk_tree_view_dy_to_top_row (tree_view);