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);
{
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));
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);
}
}
mainwindow_title(idx);
}
+/* XXX I'd like to avoid traversing the widget hierarchy. Find a better
+ * way. */
void
mainwindow_title(gint idx)
{