Merge lp:~mhr3/libunity/colorized-icon into lp:libunity

[Michal Hruby]

Add API to colorize icons using Unity.AnnotatedIcon

Add API to colorize icons using Unity.AnnotatedIcon

[Paweł Stołowski (stolowski)]

108 + if (colorize_value >= 0)

Isn't it always going to be the case?

review: Needs Information

[Michal Hruby (mhr3)]

> 108 + if (colorize_value >= 0)
>
> Isn't it always going to be the case?

No, if set_colorize_rgba() is not called, it'll remain 0. (which would otherwise mean that the icon should use alpha 0.0 which doesn't make much sense).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:284
http://jenkins.qa.ubuntu.com/job/libunity-ci/105/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-amd64-ci/90
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-armhf-ci/90
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-i386-ci/90

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/105/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

> 108 + if (colorize_value >= 0)
>
> Isn't it always going to be the case?

Eh, right, I didn't pay attention to the operator, should indeed be just >

[lp:~mhr3/libunity/colorized-icon]

285. By Michal Hruby on 2013-08-27

Fix the comparison operator

[Paweł Stołowski (stolowski)]

Looks good. +1

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2013-08-19 12:03:59 +0000
+++ configure.ac	2013-08-27 12:54:13 +0000
@@ -1,5 +1,5 @@
 # When releasing also remember to update the soname as instructed below
-AC_INIT(libunity, 7.0.12)
+AC_INIT(libunity, 7.1.0)
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-08-26 09:19:55 +0000
+++ debian/changelog	2013-08-27 12:54:13 +0000
@@ -1,8 +1,12 @@
-libunity (7.0.12+13.10.20130821-0ubuntu2) UNRELEASED; urgency=low
+libunity (7.1.0-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Pawel Stolowski ]
   * Removed openweathermap scope from list of client scopes.
 
- -- Pawel Stolowski <[e-mail]>  Mon, 26 Aug 2013 11:19:11 +0200
+  [ Michal Hruby ]
+  * Added colorize API to AnnotatedIcon.
+
+ -- Michal Hruby <[e-mail]>  Tue, 27 Aug 2013 00:02:47 +0100
 
 libunity (7.0.12+13.10.20130821-0ubuntu1) saucy; urgency=low
 
 
=== modified file 'debian/libunity9.symbols'
--- debian/libunity9.symbols	2013-08-16 10:35:23 +0000
+++ debian/libunity9.symbols	2013-08-27 12:54:13 +0000
@@ -125,6 +125,7 @@
  unity_annotated_icon_get_type@Base 5.94.0
  unity_annotated_icon_new@Base 5.94.0
  unity_annotated_icon_set_category@Base 5.94.0
+ unity_annotated_icon_set_colorize_rgba@Base 0replaceme
  unity_annotated_icon_set_icon@Base 5.94.0
  unity_annotated_icon_set_ribbon@Base 5.94.0
  unity_annotated_icon_set_size_hint@Base 6.8.0
 
=== modified file 'protocol/Makefile.am'
--- protocol/Makefile.am	2013-08-01 12:18:10 +0000
+++ protocol/Makefile.am	2013-08-27 12:54:13 +0000
@@ -40,7 +40,7 @@
   $(NULL)
 
 libunity_protocol_private_la_LIBADD = \
-  $(LIBUNITY_LIBS)
+  $(LIBUNITY_LIBS) -lm
 
 libunity_protocol_private_la_LDFLAGS = \
   $(LIBPROTOCOL_LT_LDFLAGS) \
 
=== modified file 'protocol/protocol-icon.vala'
--- protocol/protocol-icon.vala	2013-07-23 13:22:36 +0000
+++ protocol/protocol-icon.vala	2013-08-27 12:54:13 +0000
@@ -58,6 +58,7 @@
   public string ribbon { get; set; }
   public CategoryType category { get; set; default = CategoryType.NONE; }
   public bool use_small_icon { get; set; }
+  public uint32 colorize_value { get; set; }
 
   public AnnotatedIcon (Icon? base_icon)
   {
@@ -81,6 +82,22 @@
     return _hints[name];
   }
 
+  public void set_colorize_rgba (double r, double g, double b, double a)
+  {
+    const uint MAX_VAL = 255;
+    const double MAX_VAL_DBL = 255.0;
+    uint32 color = 0;
+    color += uint.min (MAX_VAL, (uint) Math.round (r * MAX_VAL_DBL));
+    color <<= 8;
+    color += uint.min (MAX_VAL, (uint) Math.round (g * MAX_VAL_DBL));
+    color <<= 8;
+    color += uint.min (MAX_VAL, (uint) Math.round (b * MAX_VAL_DBL));
+    color <<= 8;
+    color += uint.min (MAX_VAL, (uint) Math.round (a * MAX_VAL_DBL));
+
+    colorize_value = color;
+  }
+
   private bool equal (Icon? icon2)
   {
     return (this.to_string () == icon2.to_string ());
@@ -136,6 +153,13 @@
       icon._hints.remove ("use-small-icon");
     }
 
+    unowned Variant colorize_variant = icon.get_hint ("colorize-value");
+    if (colorize_variant != null)
+    {
+      icon.colorize_value = colorize_variant.get_uint32 ();
+      icon._hints.remove ("colorize-value");
+    }
+
     return icon;
   }
 
@@ -152,6 +176,8 @@
       add_hint ("ribbon", ribbon);
     if (use_small_icon)
       add_hint ("use-small-icon", new Variant.boolean (true));
+    if (colorize_value > 0)
+      add_hint ("colorize-value", new Variant.uint32 (colorize_value));
 
     Variant dict = _hints;
     tokens.add (dict.print (true));
 
=== modified file 'src/unity-icon.vala'
--- src/unity-icon.vala	2012-09-24 13:53:47 +0000
+++ src/unity-icon.vala	2013-08-27 12:54:13 +0000
@@ -104,6 +104,11 @@
       set { _pai.use_small_icon = value == IconSizeHint.SMALL; }
     }
 
+    public void set_colorize_rgba (double r, double g, double b, double a)
+    {
+      _pai.set_colorize_rgba (r, g, b, a);
+    }
+
     public AnnotatedIcon (Icon base_icon)
     {
       Object (icon: base_icon);
 
=== modified file 'test/vala/test-previews.vala'
--- test/vala/test-previews.vala	2013-03-22 12:55:21 +0000
+++ test/vala/test-previews.vala	2013-08-27 12:54:13 +0000
@@ -58,6 +58,8 @@
                                test_proto_annotated_icon_with_metadata);
       GLib.Test.add_data_func ("/Unit/AnnotatedIcon/WithMetadata",
                                test_annotated_icon_with_metadata);
+      GLib.Test.add_data_func ("/Unit/AnnotatedIcon/WithColor",
+                               test_annotated_icon_with_color);
     }
 
     static bool previews_equal (Variant data, Variant data2)
@@ -128,6 +130,23 @@
       assert (de_anno.use_small_icon == true);
     }
 
+    static void test_annotated_icon_with_color ()
+    {
+      var icon = new ThemedIcon ("internet");
+      var anno_icon = new Unity.AnnotatedIcon (icon);
+      anno_icon.set_colorize_rgba (0.5, 0.0, 1.0, 1.0);
+      assert (anno_icon.icon.equal (icon));
+      var serialized = anno_icon.to_string ();
+
+      var deserialized = Icon.new_for_string (serialized);
+      assert (deserialized.to_string () == serialized);
+
+      var de_anno = deserialized as Protocol.AnnotatedIcon;
+      assert (de_anno != null);
+      assert (de_anno.icon.equal (icon));
+      assert (de_anno.colorize_value == 0x8000ffff);
+    }
+
     static void test_preview_generic ()
     {
       var thumbnail = new ThemedIcon ("internet");