X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=browser.c;h=76dcd8e1593bcf280d80c242f341e46331694f9a;hb=b42281984353ef004f759191d70522e94fbc2c42;hp=5828b40b74e456c9cb02de23a3a0568b3dc61256;hpb=f4d5f98aa3341cf9c01ba3d9d74e2dedbafe7fe3;p=chorizo.git

diff --git a/browser.c b/browser.c
index 5828b40..76dcd8e 100644
--- a/browser.c
+++ b/browser.c
@@ -239,13 +239,16 @@ client_new(const gchar *uri, WebKitWebView *related_wv, gboolean show)
     gtk_box_pack_start(GTK_BOX(c->vbox), c->location, FALSE, FALSE, 0);
     gtk_box_pack_start(GTK_BOX(c->vbox), c->web_view, TRUE, TRUE, 0);
 
-    c->tabicon = gtk_image_new_from_icon_name("text-html", GTK_ICON_SIZE_LARGE_TOOLBAR);
+    c->tabicon = gtk_image_new_from_icon_name("text-html", GTK_ICON_SIZE_SMALL_TOOLBAR);
 
     c->tablabel = gtk_label_new(__NAME__);
     gtk_label_set_ellipsize(GTK_LABEL(c->tablabel), PANGO_ELLIPSIZE_END);
     gtk_label_set_width_chars(GTK_LABEL(c->tablabel), tab_width_chars);
 
-    tabbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+    /* XXX I don't own a HiDPI screen, so I don't know if scale_factor
+     * does the right thing. */
+    tabbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,
+                         5 * gtk_widget_get_scale_factor(mw.win));
     gtk_box_pack_start(GTK_BOX(tabbox), c->tabicon, FALSE, FALSE, 0);
     gtk_box_pack_start(GTK_BOX(tabbox), c->tablabel, TRUE, TRUE, 0);
 
@@ -410,8 +413,8 @@ changed_favicon(GObject *obj, GParamSpec *pspec, gpointer data)
 {
     struct Client *c = (struct Client *)data;
     cairo_surface_t *f;
-    int w, h;
-    GdkPixbuf *pb;
+    int w, h, w_should, h_should;
+    GdkPixbuf *pb, *pb_scaled;
 
     f = webkit_web_view_get_favicon(WEBKIT_WEB_VIEW(c->web_view));
     if (f != NULL)
@@ -421,8 +424,13 @@ changed_favicon(GObject *obj, GParamSpec *pspec, gpointer data)
         pb = gdk_pixbuf_get_from_surface(f, 0, 0, w, h);
         if (pb != NULL)
         {
-            /* TODO: Resize icon */
-            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);
         }
     }
@@ -1150,6 +1158,8 @@ mainwindow_title_before(GtkNotebook *nb, GtkWidget *p, guint idx, gpointer data)
     mainwindow_title(idx);
 }
 
+/* XXX I'd like to avoid traversing the widget hierarchy. Find a better
+ * way. */
 void
 mainwindow_title(gint idx)
 {