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

a11y: Remove idle handler for focus notifications

Browse Source
This commit is contained in:
Benjamin Otte 2011-07-07 10:25:02 +02:00
parent 0c2f454b41
commit 2bd69cbf8c
2 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
gtk/a11y/gtktreeviewaccessible.c
View File

@ -58,7 +58,8 @@ static void selection_changed_cb (GtkTreeSelection *selection,
gpointer data);
static void columns_changed (GtkTreeView *tree_view);
static void cursor_changed (GtkTreeView *tree_view);
static void cursor_changed (GtkTreeView *tree_view,
GtkTreeViewAccessible *accessible);
static gboolean focus_in (GtkWidget *widget);
static gboolean focus_out (GtkWidget *widget);
@ -260,7 +261,7 @@ gtk_tree_view_accessible_initialize (AtkObject *obj,
g_signal_connect (tree_view, "columns-changed",
G_CALLBACK (columns_changed), NULL);
g_signal_connect (tree_view, "cursor-changed",
G_CALLBACK (cursor_changed), NULL);
G_CALLBACK (cursor_changed), accessible);
g_signal_connect (tree_view, "focus-in-event",
G_CALLBACK (focus_in), NULL);
g_signal_connect (tree_view, "focus-out-event",
@ -316,8 +317,6 @@ gtk_tree_view_accessible_finalize (GObject *object)
/* remove any idle handlers still pending */
if (accessible->idle_garbage_collect_id)
g_source_remove (accessible->idle_garbage_collect_id);
if (accessible->idle_cursor_changed_id)
g_source_remove (accessible->idle_cursor_changed_id);
if (accessible->idle_expand_id)
g_source_remove (accessible->idle_expand_id);
@ -1859,22 +1858,12 @@ columns_changed (GtkTreeView *tree_view)
g_list_free (tv_cols);
}
static gint
idle_cursor_changed (gpointer data)
static void
cursor_changed (GtkTreeView *tree_view,
GtkTreeViewAccessible *accessible)
{
GtkTreeViewAccessible *accessible = GTK_TREE_VIEW_ACCESSIBLE (data);
GtkTreeView *tree_view;
GtkWidget *widget;
AtkObject *cell;
accessible->idle_cursor_changed_id = 0;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible));
if (widget == NULL)
return FALSE;
tree_view = GTK_TREE_VIEW (widget);
cell = gtk_tree_view_accessible_ref_focus_cell (tree_view);
if (cell)
{
@ -1888,7 +1877,7 @@ idle_cursor_changed (gpointer data)
accessible->focus_cell = cell;
}
if (gtk_widget_has_focus (widget))
if (gtk_widget_has_focus (GTK_WIDGET (tree_view)))
{
_gtk_cell_accessible_add_state (GTK_CELL_ACCESSIBLE (cell), ATK_STATE_ACTIVE, FALSE);
_gtk_cell_accessible_add_state (GTK_CELL_ACCESSIBLE (cell), ATK_STATE_FOCUSED, FALSE);
@ -1899,24 +1888,6 @@ idle_cursor_changed (gpointer data)
else
g_object_unref (cell);
}
return FALSE;
}
static void
cursor_changed (GtkTreeView *tree_view)
{
GtkTreeViewAccessible *accessible;
accessible = GTK_TREE_VIEW_ACCESSIBLE (gtk_widget_get_accessible (GTK_WIDGET (tree_view)));
if (accessible->idle_cursor_changed_id != 0)
return;
/* We notify the focus change in a idle handler so that the processing
* of the cursor change is completed when the focus handler is called.
* This will allow actions to be called in the focus handler
*/
accessible->idle_cursor_changed_id = gdk_threads_add_idle (idle_cursor_changed, accessible);
}
static gboolean

1
gtk/a11y/gtktreeviewaccessible.h
View File

@ -49,7 +49,6 @@ struct _GtkTreeViewAccessible
GtkAdjustment *old_vadj;
guint idle_expand_id;
guint idle_garbage_collect_id;
guint idle_cursor_changed_id;
GtkTreePath *idle_expand_path;
gboolean garbage_collection_pending;
};