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

header bar: Show a non-pixellated app icon

Browse Source 
Load a hi-dpi icon when we are running with scale=2.

https://bugzilla.gnome.org/show_bug.cgi?id=751787
This commit is contained in:
Matthias Clasen 2015-09-30 18:42:20 -04:00
parent 983cd2f7cc
commit 84c7f6c747
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkheaderbar.c
View File

@ -220,18 +220,25 @@ _gtk_header_bar_update_window_icon (GtkHeaderBar *bar,
{ {
GtkHeaderBarPrivate *priv = gtk_header_bar_get_instance_private (bar); GtkHeaderBarPrivate *priv = gtk_header_bar_get_instance_private (bar);
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
gint scale;
if (priv->titlebar_icon == NULL) if (priv->titlebar_icon == NULL)
return FALSE; return FALSE;
scale = gtk_widget_get_scale_factor (priv->titlebar_icon);
if (GTK_IS_BUTTON (gtk_widget_get_parent (priv->titlebar_icon))) if (GTK_IS_BUTTON (gtk_widget_get_parent (priv->titlebar_icon)))
pixbuf = gtk_window_get_icon_for_size (window, 16); pixbuf = gtk_window_get_icon_for_size (window, scale * 16);
else else
pixbuf = gtk_window_get_icon_for_size (window, 20); pixbuf = gtk_window_get_icon_for_size (window, scale * 20);
if (pixbuf) if (pixbuf)
{ {
gtk_image_set_from_pixbuf (GTK_IMAGE (priv->titlebar_icon), pixbuf); cairo_surface_t *surface;
surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, scale, gtk_widget_get_window (priv->titlebar_icon));
gtk_image_set_from_surface (GTK_IMAGE (priv->titlebar_icon), surface);
cairo_surface_destroy (surface);
g_object_unref (pixbuf); g_object_unref (pixbuf);
gtk_widget_show (priv->titlebar_icon); gtk_widget_show (priv->titlebar_icon);