Merge lp:~mhr3/unity/fix-scale-inversion into lp:unity

[Michal Hruby]

Fix scale inversion when processing non-rect tile textures

There were issues where non-rectangular icons were sometimes cropped, or were too small.

Fix inverted scale when adapting the size of non-rectangular tile textures.

No new tests, trivial change.

[Gord Allott (gordallott)]

seems good, but we should link to a bug somewhere

review: Approve

=== modified file 'plugins/unityshell/src/ResultRendererTile.cpp'
--- plugins/unityshell/src/ResultRendererTile.cpp	2012-04-19 11:26:26 +0000
+++ plugins/unityshell/src/ResultRendererTile.cpp	2012-04-25 12:14:18 +0000
@@ -323,7 +323,6 @@
       pixbuf_width = style.GetTileWidth() - (padding * 2);
       pixbuf_height = pixbuf_width * aspect;
 
-
       if (pixbuf_height > height)
       {
         // scaled too big, scale down
@@ -337,13 +336,19 @@
       pixbuf_width = pixbuf_height / aspect;
     }
 
+    if (gdk_pixbuf_get_height(pixbuf) == pixbuf_height)
+    {
+      // we changed our mind, fast path is good
+      return nux::CreateTexture2DFromPixbuf(pixbuf, true);
+    }
+
     nux::CairoGraphics cairo_graphics(CAIRO_FORMAT_ARGB32, pixbuf_width, pixbuf_height);
     cairo_t* cr = cairo_graphics.GetInternalContext();
 
     cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
     cairo_paint(cr);
 
-    float scale = gdk_pixbuf_get_height(pixbuf) / float(pixbuf_height);
+    float scale = float(pixbuf_height) / gdk_pixbuf_get_height(pixbuf);
 
     //cairo_translate(cr,
     //                static_cast<int>((width - (pixbuf_width * scale)) * 0.5),