Merge lp:~mhr3/unity/icon-loader-width-and-height into lp:unity

[Michal Hruby]

Change the IconLoader methods to allow specifying both maximum width and height. Updated rendering of the icon ribbons.

Change the IconLoader methods to allow specifying both maximum width and height. Also updated rendering of the icon ribbons.

[Nick Dedekind (nick-dedekind)]

502 + int size = max_height < 0 ? max_width : max_height;
510 + int size = max_height < 0 ? max_width : max_height;

I think it should use the minimum of the values if max_height < 0. so.
int size = max_height < 0 ? max_width : (max_width < 0 ? max_height : MIN(max_height, max_width));

784 switch (category)
785 {
786 + case UNITY_PROTOCOL_CATEGORY_TYPE_BOOK:
787 + helper_handle =
788 + impl->LoadFromFilename(PKGDATADIR"/emblem_books.svg", -1, cat_size, helper_slot);
789 + break;
790 case UNITY_PROTOCOL_CATEGORY_TYPE_MUSIC:

Could we put the category->resource mapping in the Dash Style?

Other than these the code looks good. I trust it meets visual design requirements :)

[Nick Dedekind (nick-dedekind)]

LGTM

review: Approve

[John Lea (johnlea)]

review: Approve (design)

[Unity Merger (unity-merger)]

The prerequisite lp:~nick-dedekind/unity/dash-results.focus+size has not yet been merged into lp:unity.

[Unity Merger (unity-merger)]

No proposals found for merge of lp:~nick-dedekind/unity/dash-results.focus+size into lp:unity.

[Omer Akram (om26er)]

review: Approve

=== modified file 'dash/ResultRendererTile.cpp'
--- dash/ResultRendererTile.cpp	2012-09-13 10:12:22 +0000
+++ dash/ResultRendererTile.cpp	2012-09-13 10:12:22 +0000
@@ -204,7 +204,7 @@
 void ResultRendererTile::LoadIcon(Result& row)
 {
   Style& style = Style::Instance();
-  std::string const& icon_hint = row.icon_hint;
+  std::string icon_hint(row.icon_hint);
 #define DEFAULT_GICON ". GThemedIcon text-x-preview"
   std::string icon_name;
   if (G_UNLIKELY(neko))
@@ -222,26 +222,20 @@
     icon_name = !icon_hint.empty() ? icon_hint : DEFAULT_GICON;
   }
 
-  GIcon*  icon = g_icon_new_for_string(icon_name.c_str(), NULL);
+  glib::Object<GIcon> icon(g_icon_new_for_string(icon_name.c_str(), NULL));
   TextureContainer* container = row.renderer<TextureContainer*>();
 
   IconLoader::IconLoaderCallback slot = sigc::bind(sigc::mem_fun(this, &ResultRendererTile::IconLoaded), icon_hint, row);
 
-  if (g_strrstr(icon_name.c_str(), "://"))
-  {
-    container->slot_handle = IconLoader::GetDefault().LoadFromURI(icon_name, style.GetTileImageSize(), slot);
-  }
-  else if (G_IS_ICON(icon))
-  {
-    container->slot_handle = IconLoader::GetDefault().LoadFromGIconString(icon_name, g_str_has_prefix(icon_name.c_str(), "/") ? style.GetTileImageSize() : style.GetTileGIconSize(), slot);
+  if (icon.IsType(G_TYPE_ICON))
+  {
+    bool use_large_icon = icon.IsType(G_TYPE_FILE_ICON) || !icon.IsType(G_TYPE_THEMED_ICON);
+    container->slot_handle = IconLoader::GetDefault().LoadFromGIconString(icon_name, style.GetTileImageSize(), use_large_icon ? style.GetTileImageSize() : style.GetTileGIconSize(), slot);
   }
   else
   {
-    container->slot_handle = IconLoader::GetDefault().LoadFromIconName(icon_name, style.GetTileGIconSize(), slot);
+    container->slot_handle = IconLoader::GetDefault().LoadFromIconName(icon_name, -1, style.GetTileGIconSize(), slot);
   }
-
-  if (icon != NULL)
-    g_object_unref(icon);
 }
 
 nux::BaseTexture* ResultRendererTile::CreateTextureCallback(std::string const& texid,
@@ -321,7 +315,8 @@
 
 
 void ResultRendererTile::IconLoaded(std::string const& texid,
-                                    unsigned size,
+                                    int max_width,
+                                    int max_height,
                                     glib::Object<GdkPixbuf> const& pixbuf,
                                     std::string icon_name,
                                     Result& row)
@@ -333,7 +328,7 @@
   if (pixbuf && container)
   {
     TextureCache& cache = TextureCache::GetDefault();
-    BaseTexturePtr texture(cache.FindTexture(icon_name, size, size,
+    BaseTexturePtr texture(cache.FindTexture(icon_name, max_width, max_height,
                            sigc::bind(sigc::mem_fun(this, &ResultRendererTile::CreateTextureCallback), pixbuf)));
 
     BaseTexturePtr texture_prelight(cache.FindTexture("resultview_prelight", style.GetTileIconHightlightWidth(), style.GetTileIconHightlightHeight(),  sigc::mem_fun(this, &ResultRendererTile::DrawHighlight)));
@@ -350,9 +345,8 @@
   {
     // we need to load a missing icon
     IconLoader::IconLoaderCallback slot = sigc::bind(sigc::mem_fun(this, &ResultRendererTile::IconLoaded), icon_name, row);
-    container->slot_handle = IconLoader::GetDefault().LoadFromGIconString(". GThemedIcon text-x-preview", size, slot);
+    container->slot_handle = IconLoader::GetDefault().LoadFromGIconString(". GThemedIcon text-x-preview", max_width, max_height, slot);
   }
-
 }
 
 
 
=== modified file 'dash/ResultRendererTile.h'
--- dash/ResultRendererTile.h	2012-09-13 10:12:22 +0000
+++ dash/ResultRendererTile.h	2012-09-13 10:12:22 +0000
@@ -90,7 +90,7 @@
   nux::ObjectPtr<nux::BaseTexture> normal_cache_;
 private:
   //icon loading callbacks
-  void IconLoaded(std::string const& texid, unsigned size,
+  void IconLoaded(std::string const& texid, int max_width, int max_height,
                   glib::Object<GdkPixbuf> const& pixbuf,
                   std::string icon_name, Result& row);
   nux::BaseTexture* CreateTextureCallback(std::string const& texid,
 
=== modified file 'launcher/DeviceNotificationDisplayImp.cpp'
--- launcher/DeviceNotificationDisplayImp.cpp	2012-08-22 09:03:25 +0000
+++ launcher/DeviceNotificationDisplayImp.cpp	2012-09-13 10:12:22 +0000
@@ -40,12 +40,13 @@
   void Show(std::string const& icon_name, std::string const& volume_name)
   {
     int icon_size = 48;
-    IconLoader::GetDefault().LoadFromGIconString(icon_name, icon_size,
+    IconLoader::GetDefault().LoadFromGIconString(icon_name, -1, icon_size,
                                                  sigc::bind(sigc::mem_fun(this, &Impl::ShowNotificationWhenIconIsReady), volume_name));
   }
 
   void ShowNotificationWhenIconIsReady(std::string const& icon_name,
-                                       unsigned size,
+                                       int max_width,
+                                       int max_height,
                                        glib::Object<GdkPixbuf> const& pixbuf,
                                        std::string const& volume_name)
   {
@@ -55,7 +56,7 @@
 
     notify_notification_set_hint(notification, "x-canonical-private-synchronous", g_variant_new_boolean(TRUE));
 
-    if (GDK_IS_PIXBUF(pixbuf.RawPtr()))
+    if (pixbuf)
       notify_notification_set_image_from_pixbuf(notification, pixbuf);
 
     notify_notification_show(notification, nullptr);
 
=== added file 'plugins/unityshell/resources/emblem_apps.svg'
--- plugins/unityshell/resources/emblem_apps.svg	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/resources/emblem_apps.svg	2012-09-13 10:12:22 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="14px" height="14px" viewBox="0 0 14 14" enable-background="new 0 0 14 14" xml:space="preserve">
+<path fill="#DC4A26" d="M8.5,4.504v7.997c0,0.55-0.469,0.999-1.018,0.999H6.498c-0.55,0-0.998-0.449-0.998-0.999V4.504H8.5z"/>
+<g>
+	<path fill="#DC4A26" d="M4.5,4.504h-2v-1h2V1.505c0-0.55-0.45-1-1-1H1.501c-0.55,0-1,0.45-1,1L0.5,12.501
+		c0,0.55,0.45,0.999,1,0.999h1.999c0.55,0,1-0.449,1-0.999V10.5L2.5,10.502v-1L4.499,9.5V7.503H2.5v-1h2"/>
+</g>
+<path fill="#DC4A26" d="M4.5,6.503v-1l0,0V6.503L4.5,6.503z"/>
+<path fill="#DC4A26" d="M4.5,9.502v-1h0L4.5,9.502L4.5,9.502z"/>
+<path fill="#DC4A26" d="M4.5,12.499L4.5,12.499L4.5,12.499L4.5,12.499L4.5,12.499z"/>
+<path fill="#DC4A26" d="M11.866,0.508v1.237C12.102,1.856,12.3,2.052,12.3,2.286c0,0.354-0.358,0.64-0.8,0.64s-0.8-0.286-0.8-0.64
+	c0-0.234,0.198-0.43,0.433-0.541V0.508C10.66,0.972,9.5,2.321,9.5,2.917c0,0.884,1.116,1.6,2,1.6s2-0.716,2-1.6
+	C13.5,2.321,12.34,0.972,11.866,0.508z"/>
+<path fill="#DC4A26" d="M5.501,3.499L7.047,0.5L8.5,3.499H5.501z"/>
+<path fill="#DC4A26" d="M13.5,5.503v6.998c0,0.55-0.45,0.999-1,0.999h-2c-0.55,0-1-0.449-1-0.999V5.503H13.5z"/>
+</svg>
 
=== added file 'plugins/unityshell/resources/emblem_books.svg'
--- plugins/unityshell/resources/emblem_books.svg	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/resources/emblem_books.svg	2012-09-13 10:12:22 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="14px" height="14px" viewBox="0 0 14 14" enable-background="new 0 0 14 14" xml:space="preserve">
+<path fill="#DC4A26" d="M7,1.879C6.961,1.473,6.427,0.227,1,1.5c0,3.222,0,7.449,0,11C7.009,10.945,7,13,7,13s-0.009-2.055,6-0.5
+	c0-3.551,0-7.778,0-11C7.574,0.227,7.039,1.473,7,1.879z M5,9H2V8h3V9z M5,7H2V6h3V7z M5,5H2V4h3V5z M7.5,12h-1V2h1V12z M12,9H9V8h3
+	V9z M12,7H9V6h3V7z M12,5H9V4h3V5z"/>
+</svg>
 
=== added file 'plugins/unityshell/resources/emblem_clothes.svg'
--- plugins/unityshell/resources/emblem_clothes.svg	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/resources/emblem_clothes.svg	2012-09-13 10:12:22 +0000
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="14px" height="14px" viewBox="0 0 14 14" enable-background="new 0 0 14 14" xml:space="preserve">
+<path fill="#DC4A26" d="M10.997,13V5.013l1.505,0.772L14,2.942L10.974,1L8.988,1.002c0,1.121-0.916,2.029-2.046,2.029
+	S5.012,2.123,5.012,1.002L2.969,1L0,2.942l1.498,2.843l1.447-0.772V13H10.997z"/>
+</svg>
 
=== added file 'plugins/unityshell/resources/emblem_music.svg'
--- plugins/unityshell/resources/emblem_music.svg	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/resources/emblem_music.svg	2012-09-13 10:12:22 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="14px" height="14px" viewBox="0 0 14 14" enable-background="new 0 0 14 14" xml:space="preserve">
+<g>
+	<g>
+		<path fill="#DC4A26" d="M13,0.598c0-0.386-0.307-0.651-0.683-0.588L5.672,1.186C5.296,1.249,5,1.617,5,2.005v7.249
+			C4.228,8.862,3.14,8.925,2.157,9.52c-1.393,0.841-2.033,2.413-1.43,3.506c0.603,1.094,2.223,1.299,3.615,0.455
+			c1.078-0.65,1.697-1.735,1.648-2.699L6,10.789V3.624c0-0.386,0.277-0.756,0.653-0.818l4.684-0.823C11.712,1.919,12,2.184,12,2.57
+			v4.684c-0.771-0.393-1.86-0.329-2.843,0.265C7.764,8.36,7.123,9.931,7.727,11.024c0.603,1.094,2.222,1.3,3.615,0.456
+			c1.069-0.646,1.689-1.721,1.649-2.68L13,8.808V0.598z"/>
+	</g>
+</g>
+</svg>
 
=== added file 'plugins/unityshell/resources/emblem_video.svg'
--- plugins/unityshell/resources/emblem_video.svg	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/resources/emblem_video.svg	2012-09-13 10:12:22 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="14px" height="14px" viewBox="0 0 14 14" enable-background="new 0 0 14 14" xml:space="preserve">
+<g>
+	<g>
+		<path fill="#DC4A26" d="M12.301,2.5H1.7C1.315,2.5,1,2.813,1,3.196v7.608C1,11.188,1.315,11.5,1.7,11.5h10.601
+			c0.385,0,0.699-0.312,0.699-0.696V3.196C13,2.813,12.686,2.5,12.301,2.5z M2.989,10.455H1.994V9.498h0.996V10.455z M2.989,8.49
+			H1.994V7.5h0.996V8.49z M2.989,6.494H1.994V5.535h0.996V6.494z M2.989,4.496H1.994V3.538h0.996V4.496z M8.006,7.841
+			C7.659,8.126,7.308,8.404,6.954,8.677C6.6,8.947,6.255,9.197,5.92,9.426c-0.335,0.229-0.64,0.422-0.913,0.579V4.026
+			c0.261,0.158,0.559,0.35,0.894,0.578c0.335,0.229,0.68,0.476,1.034,0.74c0.354,0.265,0.708,0.54,1.061,0.825
+			c0.355,0.286,0.687,0.565,0.998,0.836C8.684,7.276,8.354,7.555,8.006,7.841z M11.992,10.455h-0.996V9.498h0.996V10.455z
+			 M11.992,8.49h-0.996V7.5h0.996V8.49z M11.992,6.494h-0.996V5.535h0.996V6.494z M11.992,4.496h-0.996V3.538h0.996V4.496z"/>
+	</g>
+</g>
+</svg>
 
=== modified file 'tests/test_icon_loader.cpp'
--- tests/test_icon_loader.cpp	2012-08-20 18:41:49 +0000
+++ tests/test_icon_loader.cpp	2012-09-13 10:12:22 +0000
@@ -47,7 +47,7 @@
   bool got_callback;
 
   LoadResult() : pixbuf(NULL), got_callback(false) {}
-  void IconLoaded(std::string const& icon_name, unsigned size,
+  void IconLoaded(std::string const& icon_name, int max_width, int max_height,
                   glib::Object<GdkPixbuf> const& buf)
   {
     pixbuf = buf;
@@ -71,7 +71,7 @@
   IconLoader& icon_loader = IconLoader::GetDefault();
   volatile bool timeout_reached = false;
 
-  icon_loader.LoadFromIconName("gedit-icon", 48, sigc::mem_fun(load_result,
+  icon_loader.LoadFromIconName("gedit-icon", -1, 48, sigc::mem_fun(load_result,
         &LoadResult::IconLoaded));
 
   guint tid = g_timeout_add (10000, TimeoutReached, (gpointer)(&timeout_reached));
@@ -93,7 +93,7 @@
   volatile bool timeout_reached = false;
 
   
-  icon_loader.LoadFromGIconString(". UnityProtocolAnnotatedIcon %7B'base-icon':%20%3C'gedit-icon'%3E,%20'ribbon':%20%3C'foo'%3E%7D", 48, sigc::mem_fun(load_result,
+  icon_loader.LoadFromGIconString(". UnityProtocolAnnotatedIcon %7B'base-icon':%20%3C'gedit-icon'%3E,%20'ribbon':%20%3C'foo'%3E%7D", -1, 48, sigc::mem_fun(load_result,
         &LoadResult::IconLoaded));
 
   guint tid = g_timeout_add (10000, TimeoutReached, (gpointer)(&timeout_reached));
@@ -125,7 +125,7 @@
   // be cached already!
   for (int i = 0; i < load_count; i++)
   {
-    handles[i] = icon_loader.LoadFromIconName("web-browser", 48,
+    handles[i] = icon_loader.LoadFromIconName("web-browser", -1, 48,
         sigc::mem_fun(results[i], &LoadResult::IconLoaded));
   }
 
@@ -190,7 +190,7 @@
   for (GList *it = icons; it != NULL; it = it->next)
   {
     const char *icon_name = static_cast<char*>(it->data);
-    icon_loader.LoadFromIconName(icon_name, 48, sigc::mem_fun(results[i++],
+    icon_loader.LoadFromIconName(icon_name, -1, 48, sigc::mem_fun(results[i++],
         &LoadResult::IconLoaded));
     if (i >= icon_count) break;
   }
@@ -235,7 +235,7 @@
   for (GList *it = icons; it != NULL; it = it->next)
   {
     const char *icon_name = static_cast<char*>(it->data);
-    int handle = icon_loader.LoadFromIconName(icon_name, 48, sigc::mem_fun(
+    int handle = icon_loader.LoadFromIconName(icon_name, -1, 48, sigc::mem_fun(
           results[i], &LoadResult::IconLoaded));
     handles[i++] = handle;
     if (i >= icon_count) break;
 
=== modified file 'unity-shared/CoverArt.cpp'
--- unity-shared/CoverArt.cpp	2012-09-03 22:45:44 +0000
+++ unity-shared/CoverArt.cpp	2012-09-13 10:12:22 +0000
@@ -41,7 +41,7 @@
 {
 nux::logging::Logger logger("unity.dash.previews.coverart");
 
-const int icon_width = 256;
+const int ICON_SIZE = 256;
 }
 
 NUX_IMPLEMENT_OBJECT_TYPE(CoverArt);
@@ -109,9 +109,9 @@
 
   // texture from file.
   if (bLoadTexture)
-  {    
+  {
     StartWaiting();
-    slot_handle_ = IconLoader::GetDefault().LoadFromGIconString(image_hint, ~0, sigc::mem_fun(this, &CoverArt::TextureLoaded));
+    slot_handle_ = IconLoader::GetDefault().LoadFromGIconString(image_hint, -1, -1, sigc::mem_fun(this, &CoverArt::TextureLoaded));
   }
   else if (!image_hint.empty())
   {
@@ -121,12 +121,12 @@
     if (G_IS_ICON(icon))
     {
       StartWaiting();
-      slot_handle_ = IconLoader::GetDefault().LoadFromGIconString(image_hint, icon_width, sigc::mem_fun(this, &CoverArt::IconLoaded));
+      slot_handle_ = IconLoader::GetDefault().LoadFromGIconString(image_hint, ICON_SIZE, ICON_SIZE, sigc::mem_fun(this, &CoverArt::IconLoaded));
     }
     else
     {
       StartWaiting();
-      slot_handle_ = IconLoader::GetDefault().LoadFromIconName(image_hint, icon_width, sigc::mem_fun(this, &CoverArt::IconLoaded));
+      slot_handle_ = IconLoader::GetDefault().LoadFromIconName(image_hint, ICON_SIZE, ICON_SIZE, sigc::mem_fun(this, &CoverArt::IconLoaded));
     }
   }
   else
@@ -195,7 +195,10 @@
   }
 }
 
-void CoverArt::IconLoaded(std::string const& texid, unsigned size, glib::Object<GdkPixbuf> const& pixbuf)
+void CoverArt::IconLoaded(std::string const& texid,
+                          int max_width,
+                          int max_height,
+                          glib::Object<GdkPixbuf> const& pixbuf)
 {
   // Finished waiting
   StopWaiting();
@@ -207,7 +210,7 @@
     return;
   }
 
-  int height = size;
+  int height = max_height;
 
   int pixbuf_width, pixbuf_height;
   pixbuf_width = gdk_pixbuf_get_width(pixbuf);
@@ -232,7 +235,7 @@
     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 = icon_width;
+      pixbuf_width = ICON_SIZE;
       pixbuf_height = pixbuf_width * aspect;
 
       if (pixbuf_height > height)
@@ -274,7 +277,10 @@
   }
 }
 
-void CoverArt::TextureLoaded(std::string const& texid, unsigned size, glib::Object<GdkPixbuf> const& pixbuf)
+void CoverArt::TextureLoaded(std::string const& texid,
+                             int max_width,
+                             int max_height,
+                             glib::Object<GdkPixbuf> const& pixbuf)
 {
   // Finished waiting
   StopWaiting();
@@ -489,4 +495,4 @@
 
 }
 }
-}
 \ No newline at end of file
+}
 
=== modified file 'unity-shared/CoverArt.h'
--- unity-shared/CoverArt.h	2012-08-28 10:15:19 +0000
+++ unity-shared/CoverArt.h	2012-09-13 10:12:22 +0000
@@ -70,8 +70,8 @@
   void OnThumbnailError(std::string const& error_hint);
   bool OnFrameTimeout();
 
-  void IconLoaded(std::string const& texid, unsigned size, glib::Object<GdkPixbuf> const& pixbuf);
-  void TextureLoaded(std::string const& texid, unsigned size, glib::Object<GdkPixbuf> const& pixbuf);
+  void IconLoaded(std::string const& texid, int max_width, int max_height, glib::Object<GdkPixbuf> const& pixbuf);
+  void TextureLoaded(std::string const& texid, int max_width, int max_height, glib::Object<GdkPixbuf> const& pixbuf);
 
   void StartWaiting();
   void StopWaiting();
@@ -105,4 +105,4 @@
 }
 }
 
-#endif // APPLICATIONSCREENSHOT_H
 \ No newline at end of file
+#endif // APPLICATIONSCREENSHOT_H
 
=== modified file 'unity-shared/IconLoader.cpp'
--- unity-shared/IconLoader.cpp	2012-08-20 18:41:49 +0000
+++ unity-shared/IconLoader.cpp	2012-09-13 10:12:22 +0000
@@ -18,6 +18,7 @@
 */
 
 #include "IconLoader.h"
+#include "config.h"
 
 #include <queue>
 #include <sstream>
@@ -39,7 +40,8 @@
 namespace
 {
 nux::logging::Logger logger("unity.iconloader");
-const unsigned MIN_ICON_SIZE = 2;
+const int MIN_ICON_SIZE = 2;
+const int RIBBON_PADDING = 2;
 }
 
 class IconLoader::Impl
@@ -48,25 +50,29 @@
   // The Handle typedef is used to explicitly indicate which integers are
   // infact our opaque handles.
   typedef int Handle;
-  static const int FONT_SIZE = 10;
-  static const int MIN_FONT_SIZE = 6;
+  static const int FONT_SIZE = 8;
+  static const int MIN_FONT_SIZE = 5;
 
   Impl();
 
   Handle LoadFromIconName(std::string const& icon_name,
-                          unsigned size,
+                          int max_width,
+                          int max_height,
                           IconLoaderCallback slot);
 
   Handle LoadFromGIconString(std::string const& gicon_string,
-                             unsigned size,
+                             int max_width,
+                             int max_height,
                              IconLoaderCallback slot);
 
   Handle LoadFromFilename(std::string const& filename,
-                          unsigned size,
+                          int max_width,
+                          int max_height,
                           IconLoaderCallback slot);
 
   Handle LoadFromURI(std::string const& uri,
-                     unsigned size,
+                     int max_width,
+                     int max_height,
                      IconLoaderCallback slot);
 
   void DisconnectHandle(Handle handle);
@@ -88,7 +94,8 @@
 
     IconLoaderRequestType type;
     std::string data;
-    unsigned int size;
+    int max_width;
+    int max_height;
     std::string key;
     IconLoaderCallback slot;
     Handle handle;
@@ -103,12 +110,14 @@
 
     IconLoaderTask(IconLoaderRequestType type_,
                    std::string const& data_,
-                   unsigned size_,
+                   int max_width_,
+                   int max_height_,
                    std::string const& key_,
                    IconLoaderCallback slot_,
                    Handle handle_,
                    Impl* self_)
-      : type(type_), data(data_), size(size_), key(key_)
+      : type(type_), data(data_), max_width(max_width_)
+      , max_height(max_height_), key(key_)
       , slot(slot_), handle(handle_), impl(self_)
       , icon_info(nullptr), no_cache(false), helper_handle(0), idle_id(0)
       {}
@@ -126,13 +135,16 @@
     void InvokeSlot()
     {
       if (slot)
-        slot(data, size, result);
+        slot(data, max_width, max_height, result);
 
       // notify shadow tasks
       for (auto shadow_task : shadow_tasks)
       {
         if (shadow_task->slot)
-          shadow_task->slot(shadow_task->data, shadow_task->size, result);
+          shadow_task->slot(shadow_task->data,
+                            shadow_task->max_width,
+                            shadow_task->max_height,
+                            result);
 
         impl->task_map_.erase(shadow_task->handle);
       }
@@ -143,10 +155,10 @@
     bool Process()
     {
       // Check the cache again, as previous tasks might have wanted the same
-      if (impl->CacheLookup(key, data, size, slot))
+      if (impl->CacheLookup(key, data, max_width, max_height, slot))
         return true;
 
-      LOG_DEBUG(logger) << "Processing  " << data << " at size " << size;
+      LOG_DEBUG(logger) << "Processing  " << data << " at size " << max_height;
 
       // Rely on the compiler to tell us if we miss a new type
       switch (type)
@@ -161,7 +173,7 @@
 
       LOG_WARNING(logger) << "Request type " << type
                           << " is not supported (" << data
-                          << " " << size << ")";
+                          << " " << max_width << "x" << max_height << ")";
       result = nullptr;
       InvokeSlot();
 
@@ -170,6 +182,7 @@
 
     bool ProcessIconNameTask()
     {
+      int size = max_height < 0 ? max_width : (max_width < 0 ? max_height : MIN(max_height, max_width));
       GtkIconInfo* info = ::gtk_icon_theme_lookup_icon(impl->theme_, data.c_str(),
                                                        size, static_cast<GtkIconLookupFlags>(0));
       if (info)
@@ -195,6 +208,7 @@
     {
       glib::Error error;
       glib::Object<GIcon> icon(::g_icon_new_for_string(data.c_str(), &error));
+      int size = max_height < 0 ? max_width : (max_width < 0 ? max_height : MIN(max_height, max_width));
 
       if (icon.IsType(UNITY_PROTOCOL_TYPE_ANNOTATED_ICON))
       {
@@ -205,8 +219,12 @@
 
         no_cache = true;
         auto helper_slot = sigc::bind(sigc::mem_fun(this, &IconLoaderTask::BaseIconLoaded), glib::object_cast<UnityProtocolAnnotatedIcon>(icon));
+        int base_icon_width = max_width > 0 ? max_width - RIBBON_PADDING * 2 : -1;
+        int base_icon_height = base_icon_width < 0 ? max_height - RIBBON_PADDING *2 : max_height;
         helper_handle = impl->LoadFromGIconString(gicon_string.Str(),
-                                                  size, helper_slot);
+                                                  base_icon_width,
+                                                  base_icon_height,
+                                                  helper_slot);
 
         return false;
       }
@@ -271,40 +289,32 @@
       return false;
     }
 
-    void CategoryIconLoaded(std::string const& base_icon_string, unsigned size,
+    void CategoryIconLoaded(std::string const& base_icon_string,
+                            int max_width, int max_height,
                             glib::Object<GdkPixbuf> const& category_pixbuf,
                             glib::Object<UnityProtocolAnnotatedIcon> const& anno_icon)
     {
       helper_handle = 0;
-      if (category_pixbuf)
-      {
-        // assuming the category pixbuf is smaller than result
-        gdk_pixbuf_composite(category_pixbuf, result, // src, dest
-                             0, 0, // dest_x, dest_y
-                             gdk_pixbuf_get_width(category_pixbuf), // dest_w
-                             gdk_pixbuf_get_height(category_pixbuf), // dest_h
-                             0.0, 0.0, // offset_x, offset_y
-                             1.0, 1.0, // scale_x, scale_y
-                             GDK_INTERP_NEAREST, // interpolation
-                             255); // src_alpha
-      }
+      bool has_emblem = category_pixbuf;
 
       const gchar* detail_text = unity_protocol_annotated_icon_get_ribbon(anno_icon);
       if (detail_text)
       {
+        const int SHADOW_BOTTOM_PADDING = 2;
+        const int SHADOW_SIDE_PADDING = 1;
         int icon_w = gdk_pixbuf_get_width(result);
         int icon_h = gdk_pixbuf_get_height(result);
 
         int max_font_height;
         CalculateTextHeight(nullptr, &max_font_height);
 
-        max_font_height = max_font_height * 9 / 8; // let's have some padding on the stripe
-        int pixbuf_size = static_cast<int>(
-            sqrt(max_font_height*max_font_height*8));
-        if (pixbuf_size > icon_w) pixbuf_size = icon_w;
+        // FIXME: design wants the tags 2px wider than the original icon
+        int pixbuf_width = icon_w;
+        int pixbuf_height = max_font_height * 5 / 4 + SHADOW_BOTTOM_PADDING;
+        if (pixbuf_height > icon_h) pixbuf_height = icon_h;
 
         nux::CairoGraphics cairo_graphics(CAIRO_FORMAT_ARGB32,
-                                          pixbuf_size, pixbuf_size);
+                                          pixbuf_width, pixbuf_height);
         std::shared_ptr<cairo_t> cr(cairo_graphics.GetContext(), cairo_destroy);
 
         glib::Object<PangoLayout> layout;
@@ -325,10 +335,9 @@
         pango_layout_set_font_description(layout, desc.get());
         pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
 
-        double size_dbl = static_cast<double>(pixbuf_size);
-        // we'll allow tiny bit of overflow since the text is rotated and there
-        // is some space left... FIXME: 10/9? / 11/10?
-        double max_text_width = sqrt(size_dbl*size_dbl / 2) * 9/8;
+        // magic constant for the text width based on the white curve
+        double max_text_width = has_emblem ?
+          pixbuf_width * 0.72 : pixbuf_width;
 
         pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
         pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
@@ -337,9 +346,8 @@
         pango_layout_set_markup(layout, escaped_text, -1);
 
         pango_context = pango_layout_get_context(layout);  // is not ref'ed
-        // FIXME: for reasons unknown, it looks better without this
-        //pango_cairo_context_set_font_options(pango_context,
-        //                                     gdk_screen_get_font_options(screen));
+        pango_cairo_context_set_font_options(pango_context,
+                                             gdk_screen_get_font_options(screen));
         pango_cairo_context_set_resolution(pango_context,
                                            dpi == -1 ? 96.0f : dpi/(float) PANGO_SCALE);
         pango_layout_context_changed(layout);
@@ -361,32 +369,117 @@
 
         cairo_set_operator(cr.get(), CAIRO_OPERATOR_OVER);
 
-        // draw the trapezoid
-        cairo_move_to(cr.get(), 0.0, size_dbl);
-        cairo_line_to(cr.get(), size_dbl, 0.0);
-        cairo_line_to(cr.get(), size_dbl, size_dbl / 2.0);
-        cairo_line_to(cr.get(), size_dbl / 2.0, size_dbl);
-        cairo_close_path(cr.get());
-
         // this should be #dd4814
-        cairo_set_source_rgba(cr.get(), 0.86666f, 0.28235f, 0.07843f, 1.0f);
+        const double ORANGE_R = 0.86666;
+        const double ORANGE_G = 0.28235;
+        const double ORANGE_B = 0.07843;
+
+        double belt_w = static_cast<double>(pixbuf_width - SHADOW_SIDE_PADDING * 2);
+        double belt_h = static_cast<double>(pixbuf_height - SHADOW_BOTTOM_PADDING);
+
+        // translate to make space for the shadow
+        cairo_save(cr.get());
+        cairo_translate(cr.get(), 1.0, 1.0);
+
+        cairo_set_source_rgba(cr.get(), ORANGE_R, ORANGE_G, ORANGE_B, 1.0);
+
+        cairo_rectangle(cr.get(), 0.0, 0.0, belt_w, belt_h);
+        cairo_fill_preserve(cr.get());
+
+        std::shared_ptr<cairo_pattern_t> pattern(
+            cairo_pattern_create_linear(0.0, 0.0, belt_w, 0.0),
+            cairo_pattern_destroy);
+        cairo_pattern_add_color_stop_rgba(pattern.get(), 0.0, 1.0, 1.0, 1.0, 0.235294);
+        cairo_pattern_add_color_stop_rgba(pattern.get(), 0.02, 1.0, 1.0, 1.0, 0.0);
+        if (!has_emblem)
+        {
+          cairo_pattern_add_color_stop_rgba(pattern.get(), 0.98, 1.0, 1.0, 1.0, 0.0);
+          cairo_pattern_add_color_stop_rgba(pattern.get(), 1.0, 1.0, 1.0, 1.0, 0.235294);
+        }
+        cairo_pattern_add_color_stop_rgba(pattern.get(), 1.0, 1.0, 1.0, 1.0, 0.0);
+
+        cairo_set_source(cr.get(), pattern.get());
         cairo_fill(cr.get());
 
-        // draw the text (rotated!)
-        cairo_set_source_rgba(cr.get(), 1.0f, 1.0f, 1.0f, 1.0f);
-        cairo_move_to(cr.get(), size_dbl * 0.25, size_dbl);
-        cairo_rotate(cr.get(), -G_PI_4); // rotate by -45 degrees
-
-        pango_cairo_update_layout(cr.get(), layout);
+        if (has_emblem)
+        {
+          // paint the curve
+          const double CURVE_START_XPOS = 0.631163; // 0.651163
+          const double CURVE_CP1_XPOS = CURVE_START_XPOS + 0.068023;
+          const double CURVE_CP2_XPOS = CURVE_START_XPOS + 0.07;
+          const double CURVE_CP3_XPOS = CURVE_START_XPOS + 0.102965;
+          const double CURVE_CP4_XPOS = CURVE_START_XPOS + 0.161511;
+          const double CURVE_CP5_XPOS = CURVE_START_XPOS + 0.197093;
+          const double CURVE_END_XPOS = CURVE_START_XPOS + 0.265779;
+
+          const double CURVE_START_X = CURVE_START_XPOS * belt_w;
+
+          cairo_set_source_rgba(cr.get(), 1.0, 1.0, 1.0, 1.0);
+
+          cairo_move_to(cr.get(), CURVE_START_XPOS * belt_w, belt_h);
+          cairo_curve_to(cr.get(), CURVE_CP1_XPOS * belt_w, belt_h,
+                                   CURVE_CP2_XPOS * belt_w, 0.9825 * belt_h,
+                                   CURVE_CP3_XPOS * belt_w, 0.72725 * belt_h);
+          cairo_line_to(cr.get(), CURVE_CP4_XPOS * belt_w, 0.27275 * belt_h);
+          cairo_curve_to(cr.get(), CURVE_CP5_XPOS * belt_w, 0.0,
+                                   CURVE_CP5_XPOS * belt_w, 0.0,
+                                   CURVE_END_XPOS * belt_w, 0.0);
+          cairo_line_to(cr.get(), belt_w, 0.0);
+          cairo_line_to(cr.get(), belt_w, belt_h);
+          cairo_close_path(cr.get());
+          cairo_fill(cr.get());
+
+          // and the highlight
+          pattern.reset(cairo_pattern_create_linear(CURVE_START_X, 0.0, belt_w, 0.0),
+                        cairo_pattern_destroy);
+          cairo_pattern_add_color_stop_rgba(pattern.get(), 0.0, 1.0, 1.0, 1.0, 0.0);
+          cairo_pattern_add_color_stop_rgba(pattern.get(), 0.95, 1.0, 1.0, 1.0, 0.0);
+          cairo_pattern_add_color_stop_rgba(pattern.get(), 1.0, 0.0, 0.0, 0.0, 0.235294);
+          cairo_set_source(cr.get(), pattern.get());
+          cairo_rectangle(cr.get(), CURVE_START_X, 0.0, belt_w - CURVE_START_X, belt_h);
+          cairo_fill(cr.get());
+
+          // paint the emblem
+          int category_pb_w = gdk_pixbuf_get_width(category_pixbuf);
+          int category_pb_h = gdk_pixbuf_get_height(category_pixbuf);
+          double category_pb_x = 
+            belt_w - category_pb_w > CURVE_CP4_XPOS * belt_w ?
+              CURVE_CP4_XPOS * belt_w + ((1 - CURVE_CP4_XPOS) * belt_w - category_pb_w) / 2 : CURVE_CP4_XPOS * belt_w;
+          gdk_cairo_set_source_pixbuf(cr.get(), category_pixbuf,
+                                      category_pb_x, (belt_h - category_pb_h) / 2);
+          cairo_paint(cr.get());
+        }
+
+        cairo_set_source_rgba(cr.get(), 1.0, 1.0, 1.0, 1.0);
+        cairo_move_to(cr.get(), 0.0, belt_h / 2);
         pango_layout_get_pixel_size(layout, nullptr, &text_height);
         // current point is now in the middle of the stripe, need to translate
         // it, so that the text is centered
         cairo_rel_move_to(cr.get(), 0.0, text_height / -2.0);
-        double diagonal = sqrt(size_dbl*size_dbl*2);
-        // x coordinate also needs to be shifted
-        cairo_rel_move_to(cr.get(), (diagonal - max_text_width) / 4, 0.0);
         pango_cairo_show_layout(cr.get(), layout);
 
+        // paint the shadow
+        cairo_restore(cr.get());
+
+        pattern.reset(cairo_pattern_create_linear(0.0, belt_h, 0.0, belt_h + SHADOW_BOTTOM_PADDING),
+                      cairo_pattern_destroy);
+        cairo_pattern_add_color_stop_rgba(pattern.get(), 0.0, 0.0, 0.0, 0.0, 0.2);
+        cairo_pattern_add_color_stop_rgba(pattern.get(), 1.0, 0.0, 0.0, 0.0, 0.0);
+
+        cairo_set_source(cr.get(), pattern.get());
+
+        cairo_rectangle(cr.get(), 0.0, belt_h, belt_w, SHADOW_BOTTOM_PADDING);
+        cairo_fill(cr.get());
+
+        cairo_set_source_rgba(cr.get(), 0.0, 0.0, 0.0, 0.1);
+        cairo_move_to(cr.get(), 0.0, 1.0);
+        cairo_line_to(cr.get(), 0.0, belt_h);
+        cairo_stroke(cr.get());
+
+        cairo_move_to(cr.get(), belt_w, 1.0);
+        cairo_line_to(cr.get(), belt_w, belt_h);
+        cairo_stroke(cr.get());
+
         // FIXME: going from image_surface to pixbuf, and then to texture :(
         glib::Object<GdkPixbuf> detail_pb(
             gdk_pixbuf_get_from_surface(cairo_graphics.GetSurface(),
@@ -394,13 +487,14 @@
                                         cairo_graphics.GetWidth(),
                                         cairo_graphics.GetHeight()));
 
+        int y_pos = icon_h - pixbuf_height - max_font_height / 2;
         gdk_pixbuf_composite(detail_pb, result, // src, dest
-                             icon_w - pixbuf_size, // dest_x
-                             icon_h - pixbuf_size, // dest_y
-                             pixbuf_size, // dest_w
-                             pixbuf_size, // dest_h
-                             icon_w - pixbuf_size, // offset_x
-                             icon_h - pixbuf_size, // offset_y
+                             0, // dest_x
+                             y_pos, // dest_y
+                             pixbuf_width, // dest_w
+                             pixbuf_height, // dest_h
+                             0, // offset_x
+                             y_pos, // offset_y
                              1.0, 1.0, // scale_x, scale_y
                              GDK_INTERP_NEAREST, // interpolation
                              255); // src_alpha
@@ -409,29 +503,76 @@
       idle_id = g_idle_add(LoadIconComplete, this);
     }
 
-    void BaseIconLoaded(std::string const& base_icon_string, unsigned size,
+    void BaseIconLoaded(std::string const& base_icon_string,
+                        int max_width, int max_height,
                         glib::Object<GdkPixbuf> const& base_pixbuf,
                         glib::Object<UnityProtocolAnnotatedIcon> const& anno_icon)
     {
       helper_handle = 0;
       if (base_pixbuf)
       {
-        result = gdk_pixbuf_copy(base_pixbuf);
+        LOG_DEBUG(logger) << "Base icon loaded: '" << base_icon_string << 
+          "' size: " << gdk_pixbuf_get_width(base_pixbuf) << 'x' <<
+                        gdk_pixbuf_get_height(base_pixbuf);
+
+        // we need extra space for the ribbon
+        result = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, 
+                                gdk_pixbuf_get_width(base_pixbuf) + RIBBON_PADDING * 2,
+                                gdk_pixbuf_get_height(base_pixbuf));
+        gdk_pixbuf_fill(result, 0x0);
+        gdk_pixbuf_copy_area(base_pixbuf, 0, 0,
+                             gdk_pixbuf_get_width(base_pixbuf),
+                             gdk_pixbuf_get_height(base_pixbuf),
+                             result,
+                             RIBBON_PADDING, 0);
         // FIXME: can we composite the pixbuf in helper thread?
         UnityProtocolCategoryType category = unity_protocol_annotated_icon_get_category(anno_icon);
         auto helper_slot = sigc::bind(sigc::mem_fun(this, &IconLoaderTask::CategoryIconLoaded), anno_icon);
-        unsigned cat_size = size / 4;
-        // FIXME: we still don't have the category assets
+        int max_font_height;
+        CalculateTextHeight(nullptr, &max_font_height);
+        unsigned cat_size = max_font_height * 9 / 8;
         switch (category)
         {
+          case UNITY_PROTOCOL_CATEGORY_TYPE_BOOK:
+            helper_handle =
+              impl->LoadFromFilename(PKGDATADIR"/emblem_books.svg", -1, cat_size, helper_slot);
+            break;
           case UNITY_PROTOCOL_CATEGORY_TYPE_MUSIC:
             helper_handle =
-              impl->LoadFromIconName("emblem-favorite", cat_size, helper_slot);
-            break;
+              impl->LoadFromFilename(PKGDATADIR"/emblem_music.svg", -1, cat_size, helper_slot);
+            break;
+          case UNITY_PROTOCOL_CATEGORY_TYPE_MOVIE:
+            helper_handle =
+              impl->LoadFromFilename(PKGDATADIR"/emblem_video.svg", -1, cat_size, helper_slot);
+            break;
+          case UNITY_PROTOCOL_CATEGORY_TYPE_CLOTHES:
+          case UNITY_PROTOCOL_CATEGORY_TYPE_SHOES:
+            helper_handle =
+              impl->LoadFromFilename(PKGDATADIR"/emblem_clothes.svg", -1, cat_size, helper_slot);
+            break;
+          case UNITY_PROTOCOL_CATEGORY_TYPE_GAMES:
+          case UNITY_PROTOCOL_CATEGORY_TYPE_ELECTRONICS:
+          case UNITY_PROTOCOL_CATEGORY_TYPE_COMPUTERS:
+          case UNITY_PROTOCOL_CATEGORY_TYPE_OFFICE:
+          case UNITY_PROTOCOL_CATEGORY_TYPE_HOME:
+          case UNITY_PROTOCOL_CATEGORY_TYPE_GARDEN:
+          case UNITY_PROTOCOL_CATEGORY_TYPE_PETS:
+          case UNITY_PROTOCOL_CATEGORY_TYPE_TOYS:
+          case UNITY_PROTOCOL_CATEGORY_TYPE_CHILDREN:
+          case UNITY_PROTOCOL_CATEGORY_TYPE_BABY:
+          case UNITY_PROTOCOL_CATEGORY_TYPE_WATCHES:
+          case UNITY_PROTOCOL_CATEGORY_TYPE_SPORTS:
+          case UNITY_PROTOCOL_CATEGORY_TYPE_OUTDOORS:
+          case UNITY_PROTOCOL_CATEGORY_TYPE_GROCERY:
+          case UNITY_PROTOCOL_CATEGORY_TYPE_HEALTH:
+          case UNITY_PROTOCOL_CATEGORY_TYPE_BEAUTY:
+          case UNITY_PROTOCOL_CATEGORY_TYPE_DIY:
+          case UNITY_PROTOCOL_CATEGORY_TYPE_TOOLS:
+          case UNITY_PROTOCOL_CATEGORY_TYPE_CAR:
           default:
             // rest of the processing is the CategoryIconLoaded, lets invoke it
             glib::Object<GdkPixbuf> null_pixbuf;
-            helper_slot("", cat_size, null_pixbuf);
+            helper_slot("", -1, cat_size, null_pixbuf);
             break;
         }
       }
@@ -463,32 +604,23 @@
         glib::String contents;
         gsize length = 0;
 
-        if (::g_file_load_contents(file, canc, &contents, &length,
+        if (g_file_load_contents(file, canc, &contents, &length,
                                  nullptr, &task->error))
         {
           glib::Object<GInputStream> stream(
-              ::g_memory_input_stream_new_from_data(contents.Value(), length, nullptr));
+              g_memory_input_stream_new_from_data(contents.Value(), length, nullptr));
 
-          if (task->size != static_cast<unsigned int>(~0))
-          {
-            task->result = ::gdk_pixbuf_new_from_stream_at_scale(stream,
-                                                                 -1,
-                                                                 task->size,
-                                                                 TRUE,
-                                                                 canc,
-                                                                 &task->error);
-          }
-          else
-          {
-            task->result = ::gdk_pixbuf_new_from_stream(stream,
-                                                        canc,
-                                                        &task->error);
-          }          
-          ::g_input_stream_close(stream, canc, nullptr);
+          task->result = gdk_pixbuf_new_from_stream_at_scale(stream,
+                                                             task->max_width,
+                                                             task->max_height,
+                                                             TRUE,
+                                                             canc,
+                                                             &task->error);
+          g_input_stream_close(stream, canc, nullptr);
         }
       }
 
-      ::g_io_scheduler_job_send_to_mainloop_async (job, LoadIconComplete, task, nullptr);
+      g_io_scheduler_job_send_to_mainloop_async (job, LoadIconComplete, task, nullptr);
 
       return FALSE;
     }
@@ -509,7 +641,9 @@
           task->result = nullptr;
 
         LOG_WARNING(logger) << "Unable to load icon " << task->data
-                            << " at size " << task->size << ": " << task->error;
+                            << " at size "
+                            << task->max_width << "x" << task->max_height
+                            << ": " << task->error;
       }
 
       impl->finished_tasks_.push_back(task);
@@ -528,21 +662,24 @@
   };
 
   Handle ReturnCachedOrQueue(std::string const& data,
-                             unsigned size,
+                             int max_width,
+                             int max_height,
                              IconLoaderCallback slot,
                              IconLoaderRequestType type);
 
   Handle QueueTask(std::string const& key,
                    std::string const& data,
-                   unsigned size,
+                   int max_width,
+                   int max_height,
                    IconLoaderCallback slot,
                    IconLoaderRequestType type);
 
-  std::string Hash(std::string const& data, unsigned size);
+  std::string Hash(std::string const& data, int max_width, int max_height);
 
   bool CacheLookup(std::string const& key,
                    std::string const& data,
-                   unsigned size,
+                   int max_width,
+                   int max_height,
                    IconLoaderCallback slot);
 
   // Looping idle callback function
@@ -600,52 +737,67 @@
 }
 
 int IconLoader::Impl::LoadFromIconName(std::string const& icon_name,
-                                       unsigned size,
+                                       int max_width,
+                                       int max_height,
                                        IconLoaderCallback slot)
 {
-  if (no_load_ || icon_name.empty() || size < MIN_ICON_SIZE || !slot)
+  if (no_load_ || icon_name.empty() || !slot ||
+      ((max_width >= 0 && max_width < MIN_ICON_SIZE) ||
+       (max_height >= 0 && max_height < MIN_ICON_SIZE)))
     return 0;
 
   // We need to check this because of legacy desktop files
   if (icon_name[0] == '/')
   {
-    return LoadFromFilename(icon_name, size, slot);
+    return LoadFromFilename(icon_name, max_width, max_height, slot);
   }
 
-  return ReturnCachedOrQueue(icon_name, size, slot, REQUEST_TYPE_ICON_NAME);
+  return ReturnCachedOrQueue(icon_name, max_width, max_height, slot,
+                             REQUEST_TYPE_ICON_NAME);
 }
 
 int IconLoader::Impl::LoadFromGIconString(std::string const& gicon_string,
-                                          unsigned size,
+                                          int max_width,
+                                          int max_height,
                                           IconLoaderCallback slot)
 {
-  if (no_load_ || gicon_string.empty() || size < MIN_ICON_SIZE || !slot)
+  if (no_load_ || gicon_string.empty() || !slot ||
+      ((max_width >= 0 && max_width < MIN_ICON_SIZE) ||
+       (max_height >= 0 && max_height < MIN_ICON_SIZE)))
     return 0;
 
-  return ReturnCachedOrQueue(gicon_string, size, slot, REQUEST_TYPE_GICON_STRING);
+  return ReturnCachedOrQueue(gicon_string, max_width, max_height, slot,
+                             REQUEST_TYPE_GICON_STRING);
 }
 
 int IconLoader::Impl::LoadFromFilename(std::string const& filename,
-                                       unsigned size,
+                                       int max_width,
+                                       int max_height,
                                        IconLoaderCallback slot)
 {
-  if (no_load_ || filename.empty() || size < MIN_ICON_SIZE || !slot)
+  if (no_load_ || filename.empty() || !slot ||
+      ((max_width >= 0 && max_width < MIN_ICON_SIZE) ||
+       (max_height >= 0 && max_height < MIN_ICON_SIZE)))
     return 0;
 
   glib::Object<GFile> file(::g_file_new_for_path(filename.c_str()));
   glib::String uri(::g_file_get_uri(file));
 
-  return LoadFromURI(uri.Str(), size, slot);
+  return LoadFromURI(uri.Str(), max_width, max_height, slot);
 }
 
 int IconLoader::Impl::LoadFromURI(std::string const& uri,
-                                  unsigned size,
+                                  int max_width,
+                                  int max_height,
                                   IconLoaderCallback slot)
 {
-  if (no_load_ || uri.empty() || size < MIN_ICON_SIZE || !slot)
+  if (no_load_ || uri.empty() || !slot ||
+      ((max_width >= 0 && max_width < MIN_ICON_SIZE) ||
+       (max_height >= 0 && max_height < MIN_ICON_SIZE)))
     return 0;
 
-  return ReturnCachedOrQueue(uri, size, slot, REQUEST_TYPE_URI);
+  return ReturnCachedOrQueue(uri, max_width, max_height, slot,
+                             REQUEST_TYPE_URI);
 }
 
 void IconLoader::Impl::DisconnectHandle(Handle handle)
@@ -699,16 +851,17 @@
 //
 
 int IconLoader::Impl::ReturnCachedOrQueue(std::string const& data,
-                                          unsigned size,
+                                          int max_width,
+                                          int max_height,
                                           IconLoaderCallback slot,
                                           IconLoaderRequestType type)
 {
   Handle result = 0;
-  std::string key(Hash(data, size));
+  std::string key(Hash(data, max_width, max_height));
 
-  if (!CacheLookup(key, data, size, slot))
+  if (!CacheLookup(key, data, max_width, max_height, slot))
   {
-    result = QueueTask(key, data, size, slot, type);
+    result = QueueTask(key, data, max_width, max_height, slot, type);
   }
   return result;
 }
@@ -716,11 +869,15 @@
 
 int IconLoader::Impl::QueueTask(std::string const& key,
                                 std::string const& data,
-                                unsigned size,
+                                int max_width,
+                                int max_height,
                                 IconLoaderCallback slot,
                                 IconLoaderRequestType type)
 {
-  auto task = std::make_shared<IconLoaderTask>(type, data, size, key, slot, ++handle_counter_, this);
+  auto task = std::make_shared<IconLoaderTask>(type, data,
+                                               max_width, max_height,
+                                               key, slot,
+                                               ++handle_counter_, this);
   auto iter = queued_tasks_.find(key);
 
   if (iter != queued_tasks_.end())
@@ -744,7 +901,8 @@
   tasks_.push(task);
   task_map_[task->handle] = task;
 
-  LOG_DEBUG(logger) << "Pushing task  " << data << " at size " << size
+  LOG_DEBUG(logger) << "Pushing task  " << data << " at size " 
+                    << max_width << "x" << max_height
                     << ", queue size now at " << tasks_.size();
 
   if (!idle_)
@@ -754,16 +912,17 @@
   return task->handle;
 }
 
-std::string IconLoader::Impl::Hash(std::string const& data, unsigned size)
+std::string IconLoader::Impl::Hash(std::string const& data, int max_width, int max_height)
 {
   std::ostringstream sout;
-  sout << data << ":" << size;
+  sout << data << ":" << max_width << "x" << max_height;
   return sout.str();
 }
 
 bool IconLoader::Impl::CacheLookup(std::string const& key,
                                    std::string const& data,
-                                   unsigned size,
+                                   int max_width,
+                                   int max_height,
                                    IconLoaderCallback slot)
 {
   auto iter = cache_.find(key);
@@ -772,7 +931,7 @@
   if (found && slot)
   {
     glib::Object<GdkPixbuf> const& pixbuf = iter->second;
-    slot(data, size, pixbuf);
+    slot(data, max_width, max_height, pixbuf);
   }
 
   return found;
@@ -848,31 +1007,35 @@
 }
 
 int IconLoader::LoadFromIconName(std::string const& icon_name,
-                                 unsigned size,
+                                 int max_width,
+                                 int max_height,
                                  IconLoaderCallback slot)
 {
-  return pimpl->LoadFromIconName(icon_name, size, slot);
+  return pimpl->LoadFromIconName(icon_name, max_width, max_height, slot);
 }
 
 int IconLoader::LoadFromGIconString(std::string const& gicon_string,
-                                    unsigned size,
+                                    int max_width,
+                                    int max_height,
                                     IconLoaderCallback slot)
 {
-  return pimpl->LoadFromGIconString(gicon_string, size, slot);
+  return pimpl->LoadFromGIconString(gicon_string, max_width, max_height, slot);
 }
 
 int IconLoader::LoadFromFilename(std::string const& filename,
-                                 unsigned size,
+                                 int max_width,
+                                 int max_height,
                                  IconLoaderCallback slot)
 {
-  return pimpl->LoadFromFilename(filename, size, slot);
+  return pimpl->LoadFromFilename(filename, max_width, max_height, slot);
 }
 
 int IconLoader::LoadFromURI(std::string const& uri,
-                            unsigned size,
+                            int max_width,
+                            int max_height,
                             IconLoaderCallback slot)
 {
-  return pimpl->LoadFromURI(uri, size, slot);
+  return pimpl->LoadFromURI(uri, max_width, max_height, slot);
 }
 
 void IconLoader::DisconnectHandle(int handle)
 
=== modified file 'unity-shared/IconLoader.h'
--- unity-shared/IconLoader.h	2012-07-16 11:03:32 +0000
+++ unity-shared/IconLoader.h	2012-09-13 10:12:22 +0000
@@ -32,7 +32,7 @@
 class IconLoader : public boost::noncopyable
 {
 public:
-  typedef std::function<void(std::string const&, unsigned, glib::Object<GdkPixbuf> const&)> IconLoaderCallback;
+  typedef std::function<void(std::string const&, int, int, glib::Object<GdkPixbuf> const&)> IconLoaderCallback;
 
   IconLoader();
   ~IconLoader();
@@ -45,19 +45,23 @@
    */
 
   int LoadFromIconName(std::string const& icon_name,
-                       unsigned size,
+                       int max_width,
+                       int max_height,
                        IconLoaderCallback slot);
 
   int LoadFromGIconString(std::string const& gicon_string,
-                          unsigned size,
+                          int max_width,
+                          int max_height,
                           IconLoaderCallback slot);
 
   int LoadFromFilename(std::string const& filename,
-                       unsigned size,
+                       int max_width,
+                       int max_height,
                        IconLoaderCallback slot);
 
   int LoadFromURI(std::string const& uri,
-                  unsigned size,
+                  int max_width,
+                  int max_height,
                   IconLoaderCallback slot);
 
   void DisconnectHandle(int handle);
 
=== modified file 'unity-shared/IconTexture.cpp'
--- unity-shared/IconTexture.cpp	2012-08-07 15:46:38 +0000
+++ unity-shared/IconTexture.cpp	2012-09-13 10:12:22 +0000
@@ -111,21 +111,21 @@
 
   glib::Object<GIcon> icon(g_icon_new_for_string(_icon_name.empty() ?  DEFAULT_GICON : _icon_name.c_str(), NULL));
 
-  if (G_IS_ICON(icon.RawPtr()))
+  if (icon.IsType(G_TYPE_ICON))
   {
     _handle = IconLoader::GetDefault().LoadFromGIconString(_icon_name.empty() ? DEFAULT_GICON : _icon_name.c_str(),
-                                                           _size,
+                                                           -1, _size,
                                                            sigc::mem_fun(this, &IconTexture::IconLoaded));
   }
   else if (_icon_name.find("http://") == 0)
   {
     _handle = IconLoader::GetDefault().LoadFromURI(_icon_name,
-                                                   _size, sigc::mem_fun(this, &IconTexture::IconLoaded));
+                                                   -1, _size, sigc::mem_fun(this, &IconTexture::IconLoaded));
   }
   else
   {
     _handle = IconLoader::GetDefault().LoadFromIconName(_icon_name,
-                                                        _size,
+                                                        -1, _size,
                                                         sigc::mem_fun(this, &IconTexture::IconLoaded));
   }
 }
@@ -153,7 +153,9 @@
   _loading = false;
 }
 
-void IconTexture::IconLoaded(std::string const& icon_name, unsigned size,
+void IconTexture::IconLoaded(std::string const& icon_name,
+                             int max_width,
+                             int max_height,
                              glib::Object<GdkPixbuf> const& pixbuf)
 {
   _handle = 0;
 
=== modified file 'unity-shared/IconTexture.h'
--- unity-shared/IconTexture.h	2012-08-07 15:46:38 +0000
+++ unity-shared/IconTexture.h	2012-09-13 10:12:22 +0000
@@ -79,7 +79,7 @@
 private:
   nux::BaseTexture* CreateTextureCallback(std::string const& texid, int width, int height);
   void Refresh(glib::Object<GdkPixbuf> const& pixbuf);
-  void IconLoaded(std::string const& icon_name, unsigned size, glib::Object<GdkPixbuf> const& pixbuf);
+  void IconLoaded(std::string const& icon_name, int max_width, int max_height, glib::Object<GdkPixbuf> const& pixbuf);
 
   std::string _icon_name;
   unsigned int _size;