diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2020-11-12 14:48:15 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2020-11-12 21:46:05 +0000 |
| commit | bfb054a02360c2b9d2acdd01a27701329933e8e3 (patch) | |
| tree | bfdf940d92e116eb1c802e7127a67ba28578937b /gtk/gtkwindowcontrols.c | |
| parent | e9407040186aaa1b0e95a44c7d9de18d86a7a01d (diff) | |
| download | gtk+-bfb054a02360c2b9d2acdd01a27701329933e8e3.tar.gz | |
a11y: Icons in WindowControls are presentational only
They don't contribute anything to the accessible description.
Diffstat (limited to 'gtk/gtkwindowcontrols.c')
| -rw-r--r-- | gtk/gtkwindowcontrols.c | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/gtk/gtkwindowcontrols.c b/gtk/gtkwindowcontrols.c index 553cbbdf0f..69dfe82534 100644 --- a/gtk/gtkwindowcontrols.c +++ b/gtk/gtkwindowcontrols.c @@ -273,15 +273,13 @@ update_window_buttons (GtkWindowControls *self) if (strcmp (tokens[i], "icon") == 0 && is_sovereign_window) { - button = gtk_image_new (); + /* The icon is not relevant for accessibility purposes */ + button = g_object_new (GTK_TYPE_IMAGE, + "accessible-role", GTK_ACCESSIBLE_ROLE_PRESENTATION, + NULL); gtk_widget_set_valign (button, GTK_ALIGN_CENTER); gtk_widget_add_css_class (button, "icon"); - /* The icon is not relevant for accessibility purposes */ - gtk_accessible_update_state (GTK_ACCESSIBLE (button), - GTK_ACCESSIBLE_STATE_HIDDEN, TRUE, - -1); - if (!update_window_icon (window, button)) { g_object_ref_sink (button); @@ -295,7 +293,11 @@ update_window_buttons (GtkWindowControls *self) button = gtk_button_new (); gtk_widget_set_valign (button, GTK_ALIGN_CENTER); gtk_widget_add_css_class (button, "minimize"); - image = gtk_image_new_from_icon_name ("window-minimize-symbolic"); + /* The icon is not relevant for accessibility purposes */ + image = g_object_new (GTK_TYPE_IMAGE, + "accessible-role", GTK_ACCESSIBLE_ROLE_PRESENTATION, + "icon-name", "window-minimize-symbolic", + NULL); g_object_set (image, "use-fallback", TRUE, NULL); gtk_button_set_child (GTK_BUTTON (button), image); gtk_widget_set_can_focus (button, FALSE); @@ -317,7 +319,11 @@ update_window_buttons (GtkWindowControls *self) button = gtk_button_new (); gtk_widget_set_valign (button, GTK_ALIGN_CENTER); gtk_widget_add_css_class (button, "maximize"); - image = gtk_image_new_from_icon_name (icon_name); + /* The icon is not relevant for accessibility purposes */ + image = g_object_new (GTK_TYPE_IMAGE, + "accessible-role", GTK_ACCESSIBLE_ROLE_PRESENTATION, + "icon-name", icon_name, + NULL); g_object_set (image, "use-fallback", TRUE, NULL); gtk_button_set_child (GTK_BUTTON (button), image); gtk_widget_set_can_focus (button, FALSE); @@ -334,7 +340,11 @@ update_window_buttons (GtkWindowControls *self) { button = gtk_button_new (); gtk_widget_set_valign (button, GTK_ALIGN_CENTER); - image = gtk_image_new_from_icon_name ("window-close-symbolic"); + /* The icon is not relevant for accessibility purposes */ + image = g_object_new (GTK_TYPE_IMAGE, + "accessible-role", GTK_ACCESSIBLE_ROLE_PRESENTATION, + "icon-name", "window-close-symbolic", + NULL); gtk_widget_add_css_class (button, "close"); g_object_set (image, "use-fallback", TRUE, NULL); gtk_button_set_child (GTK_BUTTON (button), image); |