AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-13 05:50:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'ebassi/for-master' into 'master'

Browse Source 
Ebassi/for master

See merge request GNOME/gtk!2778
This commit is contained in:
Matthias Clasen 2020-11-04 20:37:39 +00:00
commit 388f12b7d9
3 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/a11y/gtkatspicache.c
View File

@ -95,8 +95,9 @@ handle_cache_method (GDBusConnection *connection,
GDBusMethodInvocation *invocation,
gpointer user_data)
{
g_printerr ("[Cache] Method '%s' on interface '%s' for object '%s' from '%s'\n",
method_name, interface_name, object_path, sender);
GTK_NOTE (A11Y,
g_message ("[Cache] Method '%s' on interface '%s' for object '%s' from '%s'\n",
method_name, interface_name, object_path, sender));
}

12
gtk/gtktreeexpander.c
View File

@ -21,6 +21,7 @@
#include "gtktreeexpander.h"
#include "gtkaccessible.h"
#include "gtkboxlayout.h"
#include "gtkbuiltiniconprivate.h"
#include "gtkdropcontrollermotion.h"
@ -199,7 +200,16 @@ gtk_tree_expander_update_for_list_row (GtkTreeExpander *self)
if (child)
child = gtk_widget_get_prev_sibling (child);
else
gtk_widget_insert_after (gtk_builtin_icon_new ("indent"), GTK_WIDGET (self), NULL);
{
GtkWidget *indent = gtk_builtin_icon_new ("indent");
gtk_widget_insert_after (indent, GTK_WIDGET (self), NULL);
/* The indent icon is not visible in the accessibility tree */
gtk_accessible_update_state (GTK_ACCESSIBLE (indent),
GTK_ACCESSIBLE_STATE_HIDDEN, TRUE,
-1);
}
}
while (child)

21
gtk/gtkwindowcontrols.c
View File

@ -20,6 +20,7 @@
#include "gtkwindowcontrols.h"
#include "gtkaccessible.h"
#include "gtkactionable.h"
#include "gtkboxlayout.h"
#include "gtkbutton.h"
@ -272,6 +273,11 @@ update_window_buttons (GtkWindowControls *self)
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);
@ -291,6 +297,11 @@ update_window_buttons (GtkWindowControls *self)
gtk_widget_set_can_focus (button, FALSE);
gtk_actionable_set_action_name (GTK_ACTIONABLE (button),
"window.minimize");
gtk_accessible_update_property (GTK_ACCESSIBLE (button),
GTK_ACCESSIBLE_PROPERTY_LABEL, _("Minimize"),
GTK_ACCESSIBLE_PROPERTY_DESCRIPTION,
_("Minimize the window"),
-1);
}
else if (strcmp (tokens[i], "maximize") == 0 &&
resizable &&
@ -308,6 +319,11 @@ update_window_buttons (GtkWindowControls *self)
gtk_widget_set_can_focus (button, FALSE);
gtk_actionable_set_action_name (GTK_ACTIONABLE (button),
"window.toggle-maximized");
gtk_accessible_update_property (GTK_ACCESSIBLE (button),
GTK_ACCESSIBLE_PROPERTY_LABEL, _("Maximize"),
GTK_ACCESSIBLE_PROPERTY_DESCRIPTION,
_("Maximize the window"),
-1);
}
else if (strcmp (tokens[i], "close") == 0 &&
deletable)
@ -321,6 +337,11 @@ update_window_buttons (GtkWindowControls *self)
gtk_widget_set_can_focus (button, FALSE);
gtk_actionable_set_action_name (GTK_ACTIONABLE (button),
"window.close");
gtk_accessible_update_property (GTK_ACCESSIBLE (button),
GTK_ACCESSIBLE_PROPERTY_LABEL, _("Close"),
GTK_ACCESSIBLE_PROPERTY_DESCRIPTION,
_("Close the window"),
-1);
}
if (button)