Merge lp:~evfool/pantheon-files/lp1082225 into lp:~elementary-apps/pantheon-files/trunk

[Robert Roth]

If the pixbuf size is less than the image size we want, do not scale it up, as it results in a blurry image.

This branch fixes bug #1082225.
* If the pixbuf size is less than the image size we want, do not scale it up, as it results in a blurry image.
I did not take the solution from thunar (although the result is the same) as suggested in the bug, as thunar first loads the original size pixbuf, and if the size is greater than the size of the cellrenderer we want to render it to, scales the full pixbuf down to that size, otherwise (in case the pixbuf is smaller than the size of the cell renderer) it leaves it at the original size. [1]

[1] http://git.xfce.org/xfce/thunar/tree/thunar/thunar-icon-renderer.c#n454

[Danielle Foré (danrabbit)]

Definitely fixes the bug for me, Thanks Robert!

review: Approve

=== modified file 'libcore/marlin-icon-info.c'
--- libcore/marlin-icon-info.c	2013-08-10 20:20:23 +0000
+++ libcore/marlin-icon-info.c	2014-03-12 23:57:23 +0000
@@ -454,7 +454,10 @@
 #endif
 //#if 0
         char *str_icon = g_icon_to_string (icon);
-        pixbuf = gdk_pixbuf_new_from_file_at_size (str_icon, size, size, NULL);
+        gint width, height;
+        
+        gdk_pixbuf_get_file_info (str_icon, &width, &height);
+        pixbuf = gdk_pixbuf_new_from_file_at_size (str_icon, MIN (width, size), MIN (height, size), NULL);
         /*icon_info = g_object_new (MARLIN_TYPE_ICON_INFO, NULL);
         icon_info->pixbuf = pixbuf;*/
         icon_info = marlin_icon_info_new_for_pixbuf (pixbuf);

=== modified file 'src/marlin-icon-renderer.c'
--- src/marlin-icon-renderer.c	2013-08-10 20:15:26 +0000
+++ src/marlin-icon-renderer.c	2014-03-12 23:57:23 +0000
@@ -402,7 +402,7 @@
        yet, we can still determine its dimensions. This allow to asyncronously load the thumbnails
        pixbuf */
     int s = MAX (pixbuf_width, pixbuf_height);
-    priv->scale = (double)priv->size / s;
+    priv->scale = MIN (1, (double)priv->size / s);
 
     if (width)
         *width = calc_width * priv->scale;