AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-17 23:10:22 +00:00
Code Issues Projects Releases Wiki Activity

GtkLabelAccessible: update state of links

Browse Source 
This commit makes the LinkImpl children of label accessibles
inherit all their state, except for focused and visited, which
are handled directly.

https://bugzilla.gnome.org/show_bug.cgi?id=721406
This commit is contained in:
Matthias Clasen 2014-01-04 09:43:23 -05:00
parent 3bc5ab4fcd
commit b85a8001e0
3 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
gtk/a11y/gtklabelaccessible.c
View File

@ -41,6 +41,7 @@ struct _GtkLabelAccessibleLink
GtkLabelAccessible *label;
gint index;
gboolean focused;
};
struct _GtkLabelAccessibleLinkClass
@ -109,13 +110,42 @@ gtk_label_accessible_link_impl_get_hyperlink (AtkHyperlinkImpl *atk_impl)
return g_object_ref (impl->link);
}
static void
atk_hyperlink_impl_interface_init (AtkHyperlinkImplIface *iface)
{
iface->get_hyperlink = gtk_label_accessible_link_impl_get_hyperlink;
}
static AtkStateSet *
gtk_label_accessible_link_impl_ref_state_set (AtkObject *obj)
{
AtkStateSet *state_set;
GtkLabelAccessibleLink *link;
GtkWidget *widget;
link = ((GtkLabelAccessibleLinkImpl *)obj)->link;
state_set = atk_object_ref_state_set (atk_object_get_parent (obj));
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (atk_object_get_parent (obj)));
if (widget)
{
if (gtk_widget_get_can_focus (widget))
{
atk_state_set_add_state (state_set, ATK_STATE_FOCUSABLE);
if (_gtk_label_get_link_focused (GTK_LABEL (widget), link->index))
atk_state_set_add_state (state_set, ATK_STATE_FOCUSED);
else
atk_state_set_remove_state (state_set, ATK_STATE_FOCUSED);
}
if (_gtk_label_get_link_visited (GTK_LABEL (widget), link->index))
atk_state_set_add_state (state_set, ATK_STATE_VISITED);
}
return state_set;
}
static void
_gtk_label_accessible_link_impl_init (GtkLabelAccessibleLinkImpl *impl)
{
@ -136,8 +166,10 @@ static void
_gtk_label_accessible_link_impl_class_init (GtkLabelAccessibleLinkImplClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
AtkObjectClass *atk_obj_class = ATK_OBJECT_CLASS (class);
object_class->finalize = _gtk_label_accessible_link_impl_finalize;
atk_obj_class->ref_state_set = gtk_label_accessible_link_impl_ref_state_set;
}
static gchar *
@ -1110,6 +1142,33 @@ _gtk_label_accessible_update_links (GtkLabel *label)
create_links (GTK_LABEL_ACCESSIBLE (obj));
}
void
_gtk_label_accessible_focus_link_changed (GtkLabel *label)
{
AtkObject *obj;
GtkLabelAccessible *accessible;
GList *l;
GtkLabelAccessibleLinkImpl *impl;
gboolean focused;
obj = _gtk_widget_peek_accessible (GTK_WIDGET (label));
if (obj == NULL)
return;
accessible = GTK_LABEL_ACCESSIBLE (obj);
for (l = accessible->priv->links; l; l = l->next)
{
impl = l->data;
focused = _gtk_label_get_link_focused (label, impl->link->index);
if (impl->link->focused != focused)
{
impl->link->focused = focused;
atk_object_notify_state_change (ATK_OBJECT (impl), ATK_STATE_FOCUSED, focused);
}
}
}
static AtkHyperlink *
gtk_label_accessible_get_link (AtkHypertext *hypertext,
gint idx)

1
gtk/a11y/gtklabelaccessibleprivate.h
View File

@ -25,6 +25,7 @@ G_BEGIN_DECLS
void _gtk_label_accessible_text_deleted (GtkLabel *label);
void _gtk_label_accessible_text_inserted (GtkLabel *label);
void _gtk_label_accessible_update_links (GtkLabel *label);
void _gtk_label_accessible_focus_link_changed (GtkLabel *label);
G_END_DECLS

5
gtk/gtklabel.c
View File

@ -4514,6 +4514,7 @@ gtk_label_grab_focus (GtkWidget *widget)
link = priv->select_info->links->data;
priv->select_info->selection_anchor = link->start;
priv->select_info->selection_end = link->start;
_gtk_label_accessible_focus_link_changed (label);
}
}
}
@ -4540,6 +4541,7 @@ gtk_label_focus (GtkWidget *widget,
focus_link = l->data;
info->selection_anchor = focus_link->start;
info->selection_end = focus_link->start;
_gtk_label_accessible_focus_link_changed (label);
}
}
@ -4566,6 +4568,7 @@ gtk_label_focus (GtkWidget *widget,
if (link->start > index)
{
gtk_label_select_region_index (label, link->start, link->start);
_gtk_label_accessible_focus_link_changed (label);
return TRUE;
}
}
@ -4577,6 +4580,7 @@ gtk_label_focus (GtkWidget *widget,
if (link->end < index)
{
gtk_label_select_region_index (label, link->start, link->start);
_gtk_label_accessible_focus_link_changed (label);
return TRUE;
}
}
@ -4617,6 +4621,7 @@ gtk_label_focus (GtkWidget *widget,
focus_link = l->data;
info->selection_anchor = focus_link->start;
info->selection_end = focus_link->start;
_gtk_label_accessible_focus_link_changed (label);
gtk_widget_queue_draw (widget);
return TRUE;