[gtk+/gtk-3-22] HeaderBar: Use less clashing appmenu fallback icon
- From: Daniel Boles <dboles src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-3-22] HeaderBar: Use less clashing appmenu fallback icon
- Date: Sun, 6 Aug 2017 17:09:14 +0000 (UTC)
commit 69576cd51035bf412b4e8bf91f2734fa785cdf13
Author: Daniel Boles <dboles src gnome org>
Date: Sun Aug 6 18:03:27 2017 +0100
HeaderBar: Use less clashing appmenu fallback icon
process-stop-symbolic is unintuitive if represented as a stop sign as in
Adwaita, and completely ambiguous if represented as a cross like the
window close button in other icon themes.
Instead, use application-x-executable, which is already used elsewhere
as a fallback if no specific icon can be found for the application.
https://bugzilla.gnome.org/show_bug.cgi?id=784624
gtk/gtkheaderbar.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c
index 5e30198..6211f0e 100644
--- a/gtk/gtkheaderbar.c
+++ b/gtk/gtkheaderbar.c
@@ -359,6 +359,7 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
gtk_style_context_add_class (gtk_widget_get_style_context (button), "icon");
gtk_widget_set_size_request (button, 20, 20);
gtk_widget_show (button);
+
if (!_gtk_header_bar_update_window_icon (bar, window))
{
gtk_widget_destroy (button);
@@ -380,12 +381,15 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_set_can_focus (button, FALSE);
gtk_widget_show_all (button);
+
accessible = gtk_widget_get_accessible (button);
if (GTK_IS_ACCESSIBLE (accessible))
atk_object_set_name (accessible, _("Application menu"));
+
priv->titlebar_icon = image;
if (!_gtk_header_bar_update_window_icon (bar, window))
- gtk_image_set_from_icon_name (GTK_IMAGE (priv->titlebar_icon), "process-stop-symbolic",
GTK_ICON_SIZE_MENU);
+ gtk_image_set_from_icon_name (GTK_IMAGE (priv->titlebar_icon),
+ "application-x-executable-symbolic", GTK_ICON_SIZE_MENU);
}
else if (strcmp (t[j], "minimize") == 0 &&
is_sovereign_window)
@@ -401,6 +405,7 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
gtk_widget_show_all (button);
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_window_iconify), window);
+
accessible = gtk_widget_get_accessible (button);
if (GTK_IS_ACCESSIBLE (accessible))
atk_object_set_name (accessible, _("Minimize"));
@@ -424,6 +429,7 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
gtk_widget_show_all (button);
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (_gtk_window_toggle_maximized), window);
+
accessible = gtk_widget_get_accessible (button);
if (GTK_IS_ACCESSIBLE (accessible))
atk_object_set_name (accessible, maximized ? _("Restore") : _("Maximize"));
@@ -442,6 +448,7 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
gtk_widget_show_all (button);
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_window_close), window);
+
accessible = gtk_widget_get_accessible (button);
if (GTK_IS_ACCESSIBLE (accessible))
atk_object_set_name (accessible, _("Close"));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]