Merge lp:~mhr3/libunity/icon-size-hint into lp:libunity

[Michal Hruby]

Added size hint to AnnotatedIcon

Added size hint property to AnnotatedIcon. This will allow us to specify size when passing icons to unity.

[Paweł Stołowski (stolowski)]

Looking good!

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-09-18 16:39:48 +0000
+++ configure.ac	2012-09-24 13:55:31 +0000
@@ -1,5 +1,5 @@
 # When releasing also remember to update the soname as instructed below
-AC_INIT(libunity, 6.5.2)
+AC_INIT(libunity, 6.7.0)
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)
 
=== modified file 'protocol/protocol-icon.vala'
--- protocol/protocol-icon.vala	2012-09-14 10:56:35 +0000
+++ protocol/protocol-icon.vala	2012-09-24 13:55:31 +0000
@@ -57,6 +57,7 @@
   public Icon icon { get; set; }
   public string ribbon { get; set; }
   public CategoryType category { get; set; default = CategoryType.NONE; }
+  public bool use_small_icon { get; set; }
 
   public AnnotatedIcon (Icon? base_icon)
   {
@@ -128,6 +129,13 @@
       icon._hints.remove ("ribbon");
     }
 
+    unowned Variant small_icon_variant = icon.get_hint ("use-small-icon");
+    if (small_icon_variant != null)
+    {
+      icon.use_small_icon = small_icon_variant.get_boolean ();
+      icon._hints.remove ("use-small-icon");
+    }
+
     return icon;
   }
 
@@ -142,6 +150,8 @@
       add_hint ("category", new Variant.uint32 (category));
     if (ribbon != null && ribbon[0] != '\0')
       add_hint ("ribbon", ribbon);
+    if (use_small_icon)
+      add_hint ("use-small-icon", new Variant.boolean (true));
 
     Variant dict = _hints;
     tokens.add (dict.print (true));
 
=== modified file 'src/unity-icon.vala'
--- src/unity-icon.vala	2012-09-14 10:56:35 +0000
+++ src/unity-icon.vala	2012-09-24 13:55:31 +0000
@@ -53,6 +53,13 @@
     N_CATEGORIES
   }
 
+  public enum IconSizeHint
+  {
+    DEFAULT,
+    SMALL,
+    LARGE
+  }
+
   /*
    * AnnotatedIcon can be used to add various icon and text overlays to an icon.
    * Add desired overlays using properties of this class and use the to_string()
@@ -88,6 +95,15 @@
       set { _pai.category = (Protocol.CategoryType) value; }
     }
 
+    public IconSizeHint size_hint
+    {
+      get
+      {
+        return _pai.use_small_icon ? IconSizeHint.SMALL : IconSizeHint.DEFAULT;
+      }
+      set { _pai.use_small_icon = value == IconSizeHint.SMALL; }
+    }
+
     public AnnotatedIcon (Icon base_icon)
     {
       Object (icon: base_icon);
 
=== modified file 'test/vala/test-previews.vala'
--- test/vala/test-previews.vala	2012-09-17 17:27:42 +0000
+++ test/vala/test-previews.vala	2012-09-24 13:55:31 +0000
@@ -87,6 +87,7 @@
       var anno_icon = new Protocol.AnnotatedIcon (icon);
       anno_icon.ribbon = "You can't buy the internet!";
       anno_icon.category = Protocol.CategoryType.CLOTHES;
+      anno_icon.use_small_icon = true;
       var serialized = anno_icon.to_string ();
 
       var deserialized = Icon.new_for_string (serialized);
@@ -96,6 +97,7 @@
       assert (de_anno != null);
       assert (de_anno.ribbon == "You can't buy the internet!");
       assert (de_anno.category == Protocol.CategoryType.CLOTHES);
+      assert (de_anno.use_small_icon == true);
     }
 
     static void test_annotated_icon_with_metadata ()
@@ -104,6 +106,7 @@
       icon.append_name ("outernet");
       var anno_icon = new Unity.AnnotatedIcon (icon);
       anno_icon.ribbon = "You can't buy the internet!";
+      anno_icon.size_hint = Unity.IconSizeHint.SMALL;
       var serialized = anno_icon.to_string ();
 
       var deserialized = Icon.new_for_string (serialized);
@@ -114,6 +117,7 @@
       assert (de_anno.ribbon == "You can't buy the internet!");
       assert (de_anno.category == Protocol.CategoryType.NONE);
       assert (de_anno.icon.equal (icon));
+      assert (de_anno.use_small_icon == true);
     }
 
     static void test_preview_generic ()