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.

[Sam Spilsbury (smspillaz)]

review: Approve

[Thomi Richards (thomir-deactivatedaccount)]

Unit tests pass for me.

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

One thing this misses is the support for the 3 digits hex codes... i.e. #abc == #aabbcc...

=== modified file 'launcher/BamfLauncherIcon.cpp'
--- launcher/BamfLauncherIcon.cpp	2012-06-01 09:33:15 +0000
+++ launcher/BamfLauncherIcon.cpp	2012-06-10 09:49:20 +0000
@@ -782,6 +782,38 @@
   }
 }
 
+//
+// ColorStrToARGB:
+// Parses a color string in the form: "#rrggbbaa", where # and aa are optional.
+// Returns the color in 32-bit ARGB format: 0xaarrggbb.
+//
+// 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.
+//
+unsigned int ColorStrToARGB(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 (hex[digits])  // extra characters after the hex
+        ret = 0;
+      else if (digits == 6)
+        ret = (unsigned int)color | 0xff000000;
+      else if (digits == 8)   // Convert RGBA to ARGB:
+        ret = ((unsigned int)color >> 8) | ((unsigned int)color << 24);
+    }
+  }
+  return ret;
+}
+
 void BamfLauncherIcon::UpdateBackgroundColor()
 {
   bool last_use_custom_bg_color = use_custom_bg_color_;
@@ -792,7 +824,7 @@
   use_custom_bg_color_ = !color.empty();
 
   if (use_custom_bg_color_)
-    bg_color_ = nux::Color(color);
+    bg_color_ = nux::Color(ColorStrToARGB(color.c_str()));
 
   if (last_use_custom_bg_color != use_custom_bg_color_ ||
       last_bg_color != bg_color_)

=== modified file 'launcher/BamfLauncherIcon.h'
--- launcher/BamfLauncherIcon.h	2012-05-28 16:16:06 +0000
+++ launcher/BamfLauncherIcon.h	2012-06-10 09:49:20 +0000
@@ -34,6 +34,8 @@
 namespace launcher
 {
 
+extern unsigned int ColorStrToARGB(const char *str);
+
 class Launcher;
 
 class BamfLauncherIcon : public SimpleLauncherIcon

=== modified file 'tests/test_bamflaunchericon.cpp'
--- tests/test_bamflaunchericon.cpp	2012-06-06 15:42:07 +0000
+++ tests/test_bamflaunchericon.cpp	2012-06-10 09:49:20 +0000
@@ -65,4 +65,29 @@
   EXPECT_EQ(color.alpha, 0xff / 255.0f);
 }
 
+TEST_F(TestBamfLauncherIcon, TestColorStringConversion)
+{
+  EXPECT_EQ(launcher::ColorStrToARGB("#12345678"), 0x78123456);
+  EXPECT_EQ(launcher::ColorStrToARGB("12345678"), 0x78123456);
+  EXPECT_EQ(launcher::ColorStrToARGB("#12345678q"), 0x0);
+  EXPECT_EQ(launcher::ColorStrToARGB("12345678q"), 0x0);
+  EXPECT_EQ(launcher::ColorStrToARGB("#1234567890"), 0x0);
+  EXPECT_EQ(launcher::ColorStrToARGB("1234567890"), 0x0);
+  EXPECT_EQ(launcher::ColorStrToARGB("#AABBCC"), 0xFFAABBCC);
+  EXPECT_EQ(launcher::ColorStrToARGB("AABBCC"), 0xFFAABBCC);
+  EXPECT_EQ(launcher::ColorStrToARGB("#eeddccbb"), 0xBBEEDDCC);
+  EXPECT_EQ(launcher::ColorStrToARGB("eeddccbb"), 0xBBEEDDCC);
+  EXPECT_EQ(launcher::ColorStrToARGB("#2040"), 0x0);
+  EXPECT_EQ(launcher::ColorStrToARGB("2040"), 0x0);
+  EXPECT_EQ(launcher::ColorStrToARGB("#2040809"), 0x0);
+  EXPECT_EQ(launcher::ColorStrToARGB("2040809"), 0x0);
+  EXPECT_EQ(launcher::ColorStrToARGB("#204080"), 0xFF204080);
+  EXPECT_EQ(launcher::ColorStrToARGB("204080"), 0xFF204080);
+  EXPECT_EQ(launcher::ColorStrToARGB("#blah"), 0x0);
+  EXPECT_EQ(launcher::ColorStrToARGB("blah"), 0x0);
+  EXPECT_EQ(launcher::ColorStrToARGB("#"), 0x0);
+  EXPECT_EQ(launcher::ColorStrToARGB(""), 0x0);
+  EXPECT_EQ(launcher::ColorStrToARGB("helloworld helloworld !!!!"), 0x0);
+}
+
 }