Merge lp:~vanvugt/unity/fix-1010348 into lp:unity

[Daniel van Vugt]

Fix build failure with Nux 2.x. (LP: #1010348)

Don't depend on Nux 3.x API changes until it becomes necessary.

[Andrea Azzarone (azzar1)]

Can we have unit test for this?

Btw if I remember correctly when you do nux::Color(0xaabbccdd) nux create a nux color with
red = 0xbb
green = 0xcc
blue = 0xdd
alpha = 0xaa

and *not*
red = 0xaa
green = 0xbb
blue = 0xcc
alpha = 0xdd

[Daniel van Vugt (vanvugt)]

Fair question. And the answer is: Not today.

=== modified file 'launcher/BamfLauncherIcon.cpp'
--- launcher/BamfLauncherIcon.cpp	2012-06-01 09:33:15 +0000
+++ launcher/BamfLauncherIcon.cpp	2012-06-08 08:20:24 +0000
@@ -782,6 +782,35 @@
   }
 }
 
+//
+// ParseColor:
+// Parses a color string in the form: #rrggbbaa, where # and aa are optional.
+//
+// In Nux 3.x, this function is superseded by:
+//   nux::color::Color(std::string const& hex)
+// (even though this function is much smaller and faster)
+//
+// I would really like to #if NUX_VERSION <= ... around this code, but
+// no such integer macro seems to exist in the Nux headers.
+//
+static unsigned int ParseColor(const char *str)
+{
+  unsigned int ret = 0;
+  if (str)
+  {
+    const char *hex = str[0] == '#' ? str + 1 : str;
+    int digits = 0, color = 0;
+    if (sscanf(hex, "%x%n", &color, &digits))
+    {
+      if (digits == 8)
+        ret = (unsigned int)color;
+      else if (digits == 6)
+        ret = (unsigned int)color << 8;
+    }
+  }
+  return ret;
+}
+
 void BamfLauncherIcon::UpdateBackgroundColor()
 {
   bool last_use_custom_bg_color = use_custom_bg_color_;
@@ -792,7 +821,7 @@
   use_custom_bg_color_ = !color.empty();
 
   if (use_custom_bg_color_)
-    bg_color_ = nux::Color(color);
+    bg_color_ = nux::Color(ParseColor(color.c_str()));
 
   if (last_use_custom_bg_color != use_custom_bg_color_ ||
       last_bg_color != bg_color_)