diff options
author | Matthias Clasen <mclasen@redhat.com> | 2020-03-29 21:48:57 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2020-04-02 17:35:09 -0400 |
commit | 8a0035333a10148b01e9ced8b249f4e4445da12b (patch) | |
tree | 1604dc6a593cf38ff15657360f2e804989a97787 | |
parent | 1f8e633fff233883afeeb6a0452967ae163250e7 (diff) | |
download | gtk+-8a0035333a10148b01e9ced8b249f4e4445da12b.tar.gz |
a11y: Set focus-related states properly
Entries and menubuttons are no longer focusable themselves,
they have focusable children. Since we don't have accessible
objects for those, transfer the focus-related state (focusable
and focused) from the children to the main accessible object.
-rw-r--r-- | gtk/a11y/gtkentryaccessible.c | 7 | ||||
-rw-r--r-- | gtk/a11y/gtkmenubuttonaccessible.c | 23 |
2 files changed, 30 insertions, 0 deletions
diff --git a/gtk/a11y/gtkentryaccessible.c b/gtk/a11y/gtkentryaccessible.c index 3a229bb94d..01bd1c9ac2 100644 --- a/gtk/a11y/gtkentryaccessible.c +++ b/gtk/a11y/gtkentryaccessible.c @@ -387,13 +387,20 @@ gtk_entry_accessible_ref_state_set (AtkObject *accessible) AtkStateSet *state_set; gboolean value; GtkWidget *widget; + GtkWidget *text; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible)); if (widget == NULL) return NULL; + text = gtk_widget_get_first_child (widget); + state_set = ATK_OBJECT_CLASS (gtk_entry_accessible_parent_class)->ref_state_set (accessible); + atk_state_set_add_state (state_set, ATK_STATE_FOCUSABLE); + if (gtk_widget_has_focus (text)) + atk_state_set_add_state (state_set, ATK_STATE_FOCUSED); + g_object_get (G_OBJECT (widget), "editable", &value, NULL); if (value) atk_state_set_add_state (state_set, ATK_STATE_EDITABLE); diff --git a/gtk/a11y/gtkmenubuttonaccessible.c b/gtk/a11y/gtkmenubuttonaccessible.c index 17ae8be002..75482cfc21 100644 --- a/gtk/a11y/gtkmenubuttonaccessible.c +++ b/gtk/a11y/gtkmenubuttonaccessible.c @@ -77,6 +77,28 @@ gtk_menu_button_accessible_get_name (AtkObject *obj) return _("Menu"); } +static AtkStateSet * +gtk_menu_button_accessible_ref_state_set (AtkObject *obj) +{ + AtkStateSet *state_set; + GtkWidget *widget; + GtkWidget *button; + + widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj)); + if (widget == NULL) + return NULL; + + button = gtk_widget_get_first_child (widget); + + state_set = ATK_OBJECT_CLASS (gtk_menu_button_accessible_parent_class)->ref_state_set (obj); + + atk_state_set_add_state (state_set, ATK_STATE_FOCUSABLE); + if (gtk_widget_has_focus (button)) + atk_state_set_add_state (state_set, ATK_STATE_FOCUSED); + + return state_set; +} + static void gtk_menu_button_accessible_class_init (GtkMenuButtonAccessibleClass *klass) { @@ -86,6 +108,7 @@ gtk_menu_button_accessible_class_init (GtkMenuButtonAccessibleClass *klass) class->initialize = gtk_menu_button_accessible_initialize; class->get_n_children = gtk_menu_button_accessible_get_n_children; class->ref_child = gtk_menu_button_accessible_ref_child; + class->ref_state_set = gtk_menu_button_accessible_ref_state_set; } static void |