Merge lp:~midori/midori/hidpiTabs into lp:midori

[Cris Dywan]

Scale tab icons taking scale factor into account

Use GLib.Icon all the way.

[lp:~midori/midori/hidpiTabs]

7018. By Cris Dywan on 2015-08-10

No need to deal with icon size in _midori_web_view_load_icon

[gue5t gue5t (gue5t)]

Pages like <https://developer.gnome.org/gtk3/unstable/GtkApplication.html> still show a small icon (which makes tabs different sizes) with wk1; locally it looks like changing the "> icon_width" condition to "!= icon_width" (and same for height) is enough to allow upscaling to make sure we get the right size.

Also, the "Tabs" menubar menu as well as bookmarks and history still have blurry icons that we should fix, but I blame Katze infrastructure for that. It might be better to address that stuff in a separate branch.

review: Needs Fixing

[lp:~midori/midori/hidpiTabs]

7019. By gue5t <email address hidden> on 2016-01-23

Scale both larger- and smaller-than-expected tab icons

[gue5t gue5t (gue5t)]

review: Approve

=== modified file 'katze/katze-item.c'
--- katze/katze-item.c	2014-09-06 09:02:47 +0000
+++ katze/katze-item.c	2016-02-20 12:51:50 +0000
@@ -512,7 +512,7 @@
     g_return_val_if_fail (KATZE_IS_ITEM (item), NULL);
 
     pixbuf = katze_item_get_pixbuf (item, widget);
-    image = gtk_image_new_from_pixbuf (pixbuf);
+    image = gtk_image_new_from_gicon (G_ICON (pixbuf), GTK_ICON_SIZE_MENU);
     gtk_widget_show (image);
     if (pixbuf != NULL)
         g_object_unref (pixbuf);
 
=== modified file 'midori/midori-notebook.vala'
--- midori/midori-notebook.vala	2014-03-30 14:00:38 +0000
+++ midori/midori-notebook.vala	2016-02-20 12:51:50 +0000
@@ -103,10 +103,24 @@
             tooltip_text = label.label;
         }
 
+        GLib.Icon? scale_if_needed (GLib.Icon? icon, int scale) {
+            if (icon is Gdk.Pixbuf) {
+                var pixbuf = icon as Gdk.Pixbuf;
+                int icon_width = 16, icon_height = 16;
+                Gtk.icon_size_lookup (Gtk.IconSize.MENU, out icon_width, out icon_height);
+                // Apply scale factor which is only automatically applied on ThemedIcon
+                icon_width *= scale;
+                icon_height *= scale;
+                if (pixbuf.width != icon_width || pixbuf.height != icon_height)
+                    return pixbuf.scale_simple (icon_width, icon_height, Gdk.InterpType.BILINEAR);
+            }
+            return icon;
+        }
+
         void icon_changed (GLib.ParamSpec pspec) {
-            Icon? icon;
+            GLib.Icon? icon;
             tab.get ("icon", out icon);
-            this.icon.set_from_gicon (icon, Gtk.IconSize.MENU);
+            this.icon.set_from_gicon (scale_if_needed (icon, scale_factor), Gtk.IconSize.MENU);
         }
 
         void colors_changed () {
 
=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2015-09-26 22:37:02 +0000
+++ midori/midori-view.c	2016-02-20 12:51:50 +0000
@@ -344,7 +344,7 @@
                                      "icon",
                                      "Icon",
                                      "The icon of the view",
-                                     GDK_TYPE_PIXBUF,
+                                     G_TYPE_ICON,
                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
     g_object_class_install_property (gobject_class,
@@ -398,21 +398,18 @@
 
 static void
 midori_view_apply_icon (MidoriView*  view,
-                        GdkPixbuf*   icon,
+                        GIcon*       icon,
                         const gchar* icon_name)
 {
+    g_return_if_fail (icon != NULL);
+
     katze_item_set_icon (view->item, icon_name);
-    /* katze_item_get_image knows about this pixbuf */
-    if (icon != NULL)
-        g_object_ref (icon);
-    g_object_set_data_full (G_OBJECT (view->item), "pixbuf", icon,
-                            (GDestroyNotify)g_object_unref);
-    katze_object_assign (view->icon, icon);
+    katze_object_assign (view->icon, g_object_ref (icon));
     g_object_notify (G_OBJECT (view), "icon");
 
     if (view->menu_item)
     {
-        GtkWidget* image = katze_item_get_image (view->item, view->web_view);
+        GtkWidget* image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU);
         gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (view->menu_item), image);
     }
 }
@@ -420,36 +417,24 @@
 static void
 midori_view_unset_icon (MidoriView* view)
 {
-    GdkScreen* screen;
-    GtkIconTheme* icon_theme;
     gchar* content_type;
     GIcon* icon;
-    GtkIconInfo* icon_info;
-    GdkPixbuf* pixbuf = NULL;
+
+    katze_assign (view->icon_uri, NULL);
 
     content_type = g_content_type_from_mime_type (
         midori_tab_get_mime_type (MIDORI_TAB (view)));
     icon = g_content_type_get_icon (content_type);
     g_free (content_type);
     g_themed_icon_append_name (G_THEMED_ICON (icon), "text-html");
-
-    if ((screen = gtk_widget_get_screen (view->web_view))
-        && (icon_theme = gtk_icon_theme_get_for_screen (screen)))
-    {
-        if ((icon_info = gtk_icon_theme_lookup_by_gicon (icon_theme, icon, 16, 0)))
-            pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
-    }
-
-    midori_view_apply_icon (view, pixbuf, NULL);
-    g_object_unref (icon);
+    g_themed_icon_append_name (G_THEMED_ICON (icon), "text-html-symbolic");
+
+    midori_view_apply_icon (view, icon, NULL);
 }
 
 static void
 _midori_web_view_load_icon (MidoriView* view)
 {
-    gint icon_width = 16, icon_height = 16;
-    GtkSettings* settings = gtk_widget_get_settings (view->web_view);
-    gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, &icon_width, &icon_height);
     GdkPixbuf* pixbuf = NULL;
     #ifdef HAVE_WEBKIT2
     cairo_surface_t* surface = webkit_web_view_get_favicon (WEBKIT_WEB_VIEW (view->web_view));
@@ -458,15 +443,12 @@
         cairo_image_surface_get_width (surface),
         cairo_image_surface_get_height (surface))))
     {
-        GdkPixbuf* pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf,
-            icon_width, icon_height, GDK_INTERP_BILINEAR);
-        g_object_unref (pixbuf);
-        midori_view_apply_icon (view, pixbuf_scaled, view->icon_uri);
+        midori_view_apply_icon (view, G_ICON (pixbuf), view->icon_uri);
     }
     #else
     if ((pixbuf = webkit_web_view_try_get_favicon_pixbuf (
-        WEBKIT_WEB_VIEW (view->web_view), icon_width, icon_height)))
-        midori_view_apply_icon (view, pixbuf, view->icon_uri);
+        WEBKIT_WEB_VIEW (view->web_view), 0, 0)))
+        midori_view_apply_icon (view, G_ICON (pixbuf), view->icon_uri);
     #endif
 }
 
@@ -703,8 +685,6 @@
 static void
 midori_view_load_committed (MidoriView* view)
 {
-    katze_assign (view->icon_uri, NULL);
-
     GList* children = gtk_container_get_children (GTK_CONTAINER (view));
     for (; children; children = g_list_next (children))
         if (g_object_get_data (G_OBJECT (children->data), "midori-infobar-cb"))