From 0ecc03b289b6be63695b54054417f6c1efa2d1f9 Mon Sep 17 00:00:00 2001 From: Peter Hofmann Date: Mon, 27 Apr 2020 18:16:33 +0200 Subject: [PATCH] Always scale favicons If the size already matches exactly, Gdk will do nothing. --- browser.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/browser.c b/browser.c index e9a662e..b7ff002 100644 --- a/browser.c +++ b/browser.c @@ -413,7 +413,7 @@ changed_favicon(GObject *obj, GParamSpec *pspec, gpointer data) { struct Client *c = (struct Client *)data; cairo_surface_t *f; - int w, h, w_scaled, h_scaled; + int w, h, w_should, h_should; GdkPixbuf *pb, *pb_scaled; f = webkit_web_view_get_favicon(WEBKIT_WEB_VIEW(c->web_view)); @@ -424,18 +424,13 @@ changed_favicon(GObject *obj, GParamSpec *pspec, gpointer data) pb = gdk_pixbuf_get_from_surface(f, 0, 0, w, h); if (pb != NULL) { - if (w > 16 || h > 16) - { - w_scaled = 16 * gtk_widget_get_scale_factor(c->tabicon); - h_scaled = 16 * gtk_widget_get_scale_factor(c->tabicon); - pb_scaled = gdk_pixbuf_scale_simple(pb, w_scaled, h_scaled, - GDK_INTERP_BILINEAR); - gtk_image_set_from_pixbuf(GTK_IMAGE(c->tabicon), pb_scaled); - g_object_unref(pb_scaled); - } - else - gtk_image_set_from_pixbuf(GTK_IMAGE(c->tabicon), pb); + w_should = 16 * gtk_widget_get_scale_factor(c->tabicon); + h_should = 16 * gtk_widget_get_scale_factor(c->tabicon); + pb_scaled = gdk_pixbuf_scale_simple(pb, w_should, h_should, + GDK_INTERP_BILINEAR); + gtk_image_set_from_pixbuf(GTK_IMAGE(c->tabicon), pb_scaled); + g_object_unref(pb_scaled); g_object_unref(pb); } } -- 2.39.2