Merge lp:~gordallott/unity/fix-lp-878015 into lp:unity

[Gord Allott]

fixes widescreen icons being too small, makes them the correct aspect ratio and size

Small change to the dash tile visuals, fixes widescreen icons being too small, makes them the correct aspect ratio and size

[Mirco Müller (macslow)]

In plugins/unityshell/src/ResultRendererTile.h:92 there a trailing double semicolon:

 int max_icon_width_;;

Also the vertical positioning is off (for the highlight) for aspect-ratios greater then 1.0... have a look at the provided screenshots:

http://people.canonical.com/~mmueller/fix-878015-issue-1.png
http://people.canonical.com/~mmueller/fix-878015-issue-2.png

review: Needs Fixing

[Mirco Müller (macslow)]

Check the highlighted and non-highlighted states of the file launcher_corner_h_tile_mask.png (middle PlacesGroup).

[Mirco Müller (macslow)]

All good now... approved.

review: Approve

=== modified file 'plugins/unityshell/src/ResultRendererTile.cpp'
--- plugins/unityshell/src/ResultRendererTile.cpp	2012-04-03 16:14:21 +0000
+++ plugins/unityshell/src/ResultRendererTile.cpp	2012-04-05 13:21:24 +0000
@@ -95,7 +95,7 @@
                                 int x_offset, int y_offset)
 {
   TextureContainer* container = row.renderer<TextureContainer*>();
-  if (container == nullptr)
+  if (container == nullptr || container->icon == nullptr)
     return;
 
   dash::Style& style = dash::Style::Instance();
@@ -103,30 +103,29 @@
 
   // set up our texture mode
   nux::TexCoordXForm texxform;
-
-  int icon_left_hand_side = geometry.x + (geometry.width - tile_icon_size) / 2;
-  int icon_top_side = geometry.y + padding;
-
+  
+  int icon_left_hand_side = geometry.x + (geometry.width - container->icon->GetWidth()) / 2;
+  int icon_top_side = geometry.y + padding + ((tile_icon_size - container->icon->GetHeight()) / 2);
 
   if (container->blurred_icon && state == ResultRendererState::RESULT_RENDERER_NORMAL)
   {
     GfxContext.QRP_1Tex(icon_left_hand_side - 5 - x_offset,
                         icon_top_side - 5 - y_offset,
-                        tile_icon_size + 10,
-                        tile_icon_size + 10,
+                        container->blurred_icon->GetWidth(),
+                        container->blurred_icon->GetHeight(),
                         container->blurred_icon->GetDeviceTexture(),
                         texxform,
                         nux::Color(0.15f, 0.15f, 0.15f, 0.15f));
   }
 
   // render highlight if its needed
-  if (state != ResultRendererState::RESULT_RENDERER_NORMAL)
+  if (container->prelight && state != ResultRendererState::RESULT_RENDERER_NORMAL)
   {
     GfxContext.QRP_1Tex(icon_left_hand_side - highlight_padding,
                         icon_top_side - highlight_padding,
-                        tile_icon_size + (highlight_padding * 2),
-                        tile_icon_size + (highlight_padding * 2),
-                        prelight_cache_->GetDeviceTexture(),
+                        container->prelight->GetWidth(),
+                        container->prelight->GetHeight(),
+                        container->prelight->GetDeviceTexture(),
                         texxform,
                         nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
   }
@@ -136,8 +135,8 @@
   {
     GfxContext.QRP_1Tex(icon_left_hand_side,
                         icon_top_side,
-                        tile_icon_size,
-                        tile_icon_size,
+                        container->icon->GetWidth(),
+                        container->icon->GetHeight(),
                         container->icon->GetDeviceTexture(),
                         texxform,
                         nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
@@ -241,7 +240,7 @@
   std::string const& icon_hint = row.icon_hint;
 #define DEFAULT_GICON ". GThemedIcon text-x-preview"
   std::string icon_name;
-  if (neko)
+  if (G_UNLIKELY(neko))
   {
     int tmp1 = style.GetTileIconSize() + (rand() % 16) - 8;
     gsize tmp3;
@@ -288,6 +287,13 @@
   int pixbuf_width, pixbuf_height;
   pixbuf_width = gdk_pixbuf_get_width(pixbuf);
   pixbuf_height = gdk_pixbuf_get_height(pixbuf);
+  if (G_UNLIKELY(!pixbuf_height || !pixbuf_width))
+  {
+    LOG_ERROR(logger) << "Pixbuf: " << texid << " has a zero height/width: " 
+                      << width << "," << height;
+    pixbuf_width = (pixbuf_width) ? pixbuf_width : 1; // no zeros please
+    pixbuf_height = (pixbuf_height) ? pixbuf_height: 1; // no zeros please
+  }
 
   if (pixbuf_width == pixbuf_height)
   {
@@ -298,21 +304,40 @@
   {
     // slow path for non square icons that must be resized to fit in the square
     // texture
-    nux::CairoGraphics cairo_graphics(CAIRO_FORMAT_ARGB32, width, height);
+    
+    Style& style = Style::Instance();
+    float aspect = static_cast<float>(pixbuf_height) / pixbuf_width; // already sanitized width/height so can not be 0.0
+    if (aspect < 1.0f)
+    {
+      pixbuf_width = style.GetTileWidth() - (padding * 2);
+      pixbuf_width = (max_icon_width_ > 0) ? std::min(pixbuf_width, max_icon_width_) : pixbuf_width;
+      pixbuf_height = pixbuf_width * aspect;
+
+
+      if (pixbuf_height > height)
+      {
+        // scaled too big, scale down
+        pixbuf_height = height;
+        pixbuf_width = pixbuf_height / aspect;
+      }
+    }
+    else
+    {
+      pixbuf_height = height;
+      pixbuf_width = pixbuf_height / aspect;
+    }
+
+    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;
-    if (pixbuf_width > pixbuf_height)
-      scale = pixbuf_height / static_cast<float>(pixbuf_width);
-    else
-      scale = pixbuf_width / static_cast<float>(pixbuf_height);
+    float scale = gdk_pixbuf_get_height(pixbuf) / float(pixbuf_height);
 
-    cairo_translate(cr,
-                    static_cast<int>((width - (pixbuf_width * scale)) * 0.5),
-                    static_cast<int>((height - (pixbuf_height * scale)) * 0.5));
+    //cairo_translate(cr,
+    //                static_cast<int>((width - (pixbuf_width * scale)) * 0.5),
+    //                static_cast<int>((height - (pixbuf_height * scale)) * 0.5));
 
     cairo_scale(cr, scale, scale);
 
@@ -383,8 +408,11 @@
     BaseTexturePtr texture_blurred(cache.FindTexture(blur_texid, style.GetTileIconSize(), style.GetTileIconSize(),
                                    sigc::bind(sigc::mem_fun(this, &ResultRendererTile::CreateBlurredTextureCallback), pixbuf)));
 
+    BaseTexturePtr texture_prelight(cache.FindTexture("resultview_prelight", texture->GetWidth() + highlight_padding*2, texture->GetHeight() + highlight_padding*2,  sigc::mem_fun(this, &ResultRendererTile::DrawHighlight)));
+
     container->icon = texture;
     container->blurred_icon = texture_blurred;
+    container->prelight = texture_prelight; 
 
     NeedsRedraw.emit();
 

=== modified file 'plugins/unityshell/src/ResultRendererTile.h'
--- plugins/unityshell/src/ResultRendererTile.h	2012-04-03 16:14:21 +0000
+++ plugins/unityshell/src/ResultRendererTile.h	2012-04-05 13:21:24 +0000
@@ -45,6 +45,7 @@
     BaseTexturePtr text;
     BaseTexturePtr icon;
     BaseTexturePtr blurred_icon;
+    BaseTexturePtr prelight;
     int slot_handle;
 
     TextureContainer()
@@ -88,7 +89,7 @@
   void LoadIcon(Result& row);
   nux::ObjectPtr<nux::BaseTexture> prelight_cache_;
   nux::ObjectPtr<nux::BaseTexture> normal_cache_;
-
+  int max_icon_width_;
 private:
   //icon loading callbacks
   void IconLoaded(std::string const& texid,

=== modified file 'standalone-clients/CMakeLists.txt'
--- standalone-clients/CMakeLists.txt	2012-03-21 13:31:08 +0000
+++ standalone-clients/CMakeLists.txt	2012-04-05 13:21:24 +0000
@@ -45,6 +45,8 @@
                 standalone_dash.cpp
                 ${UNITY_SRC}/AbstractPlacesGroup.cpp
                 ${UNITY_SRC}/AbstractPlacesGroup.h
+                ${UNITY_SRC}/AbstractSeparator.h
+                ${UNITY_SRC}/AbstractSeparator.cpp
                 ${UNITY_SRC}/BackgroundEffectHelper.cpp
                 ${UNITY_SRC}/BackgroundEffectHelper.h
                 ${UNITY_SRC}/BGHash.cpp
@@ -105,6 +107,8 @@
                 ${UNITY_SRC}/LensView.h
                 ${UNITY_SRC}/LensViewPrivate.cpp
                 ${UNITY_SRC}/LensViewPrivate.h
+                ${UNITY_SRC}/LineSeparator.cpp
+                ${UNITY_SRC}/LineSeparator.h
                 ${UNITY_SRC}/OverlayRenderer.cpp
                 ${UNITY_SRC}/PreviewApplications.cpp
                 ${UNITY_SRC}/PreviewBase.cpp