Merge lp:~mhr3/unity-lens-applications/fix-1052513 into lp:unity-lens-applications

[Michal Hruby]

Use size-hint for items in "More suggestions" category

Use the size hint on AnnotatedIcon to ensure correctly sized icon is displayed in the "More suggestions" category.

[lp:~mhr3/unity-lens-applications/fix-1052513]

307. By Michal Hruby on 2012-09-27

Add a comment

[Paweł Stołowski (stolowski)]

LGTM. +1

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-09-25 10:24:12 +0000
+++ src/daemon.vala	2012-09-27 08:41:22 +0000
@@ -925,7 +925,8 @@
       return GLib.Path.get_basename (name);
     }
 
-    private string get_annotated_icon (Icon app_icon, string price, bool paid)
+    private string get_annotated_icon (Icon app_icon, string price, bool paid,
+                                       bool use_small_icon = true)
     {
       var annotated_icon = new AnnotatedIcon (app_icon);
       annotated_icon.category = CategoryType.APPLICATION;
@@ -940,6 +941,10 @@
       {
         annotated_icon.ribbon = _("Free");
       }
+      if (use_small_icon || app_icon.to_string () == GENERIC_APP_ICON)
+      {
+        annotated_icon.size_hint = IconSizeHint.SMALL;
+      }
       
       return annotated_icon.to_string ();
     }
@@ -965,7 +970,12 @@
         var pinfo = purchase_info.find (app.application_name, app.package_name);
         if (pinfo != null)
         {
-          var annotated_icon = get_annotated_icon (app_icon, pinfo.formatted_price, pinfo.paid);
+          // magazines need to use large icons
+          bool use_small_icon = app.desktop_file.has_suffix (".desktop");
+          var annotated_icon = get_annotated_icon (app_icon,
+                                                   pinfo.formatted_price,
+                                                   pinfo.paid,
+                                                   use_small_icon);
           icon_obj = annotated_icon.to_string ();
         }
         else
@@ -1060,9 +1070,13 @@
            * but only use that after we've de-duped the results.
            * But only change the URI *after* we've de-duped the results! */
           uri = @"unity-install://$(pkginfo.package_name)/$(pkginfo.application_name)";
-          available_uris.add (uri);   
+          available_uris.add (uri);
 
-          icon_str = get_annotated_icon (icon, pkginfo.price, !pkginfo.needs_purchase);
+          // magazines need to use large icons
+          bool use_small_icon = pkginfo.desktop_file.has_suffix (".desktop");
+          icon_str = get_annotated_icon (icon, pkginfo.price,
+                                         !pkginfo.needs_purchase,
+                                         use_small_icon);
         }
         else
         {