callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use window icons for fallback

Browse Source 
When the window has an icon, use it for the fallback menu
button.
This commit is contained in:
Matthias Clasen
2013-11-16 16:41:26 -05:00
parent 055e4722f5
commit d297500976
1 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gtk/gtkheaderbar.c
View File

@ -256,7 +256,6 @@ add_menu_button (GtkHeaderBar *bar,
GtkHeaderBarPrivate *priv = gtk_header_bar_get_instance_private (bar); GtkHeaderBarPrivate *priv = gtk_header_bar_get_instance_private (bar);
GtkWidget *window; GtkWidget *window;
GtkWidget *button; GtkWidget *button;
const gchar *icon_name;
GtkWidget *image; GtkWidget *image;
GtkWidget *separator; GtkWidget *separator;
GtkStyleContext *context; GtkStyleContext *context;
@ -271,13 +270,33 @@ add_menu_button (GtkHeaderBar *bar,
context = gtk_widget_get_style_context (button); context = gtk_widget_get_style_context (button);
gtk_style_context_add_class (context, "image-button"); gtk_style_context_add_class (context, "image-button");
gtk_style_context_add_class (context, "titlebutton"); gtk_style_context_add_class (context, "titlebutton");
image = NULL;
window = gtk_widget_get_toplevel (GTK_WIDGET (bar)); window = gtk_widget_get_toplevel (GTK_WIDGET (bar));
icon_name = NULL;
if (GTK_IS_WINDOW (window)) if (GTK_IS_WINDOW (window))
{
const gchar *icon_name;
GdkPixbuf *icon;
icon_name = gtk_window_get_icon_name (GTK_WINDOW (window)); icon_name = gtk_window_get_icon_name (GTK_WINDOW (window));
if (icon_name == NULL) icon = gtk_window_get_icon (GTK_WINDOW (window));
icon_name = "process-stop-symbolic"; if (icon_name != NULL)
{
image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
}
else if (icon != NULL)
{
if (gdk_pixbuf_get_width (icon) > 16)
{
GdkPixbuf *pixbuf;
pixbuf = gdk_pixbuf_scale_simple (icon, 16, 16, GDK_INTERP_BILINEAR);
image = gtk_image_new_from_pixbuf (pixbuf);
g_object_unref (pixbuf);
}
else
image = gtk_image_new_from_pixbuf (icon);
}
}
if (image == NULL)
image = gtk_image_new_from_icon_name ("process-stop-symbolic", GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (button), image); gtk_container_add (GTK_CONTAINER (button), image);
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
accessible = gtk_widget_get_accessible (button); accessible = gtk_widget_get_accessible (button);