commit 30b962eb5184490c10cd9f44cd161e4b93403b37
author Dees_Troy <dees_troy@teamw.in> Fri Oct 19 20:48:59 2012 -0400
committer Dees_Troy <dees_troy@teamw.in> Fri Oct 19 20:51:12 2012 -0400
tree fdc5a138600233d2bc69a7edf04b13b0f7edcf20
parent 4d12f969b8fa40497b60a6e15873b1b3af924dda

Add keyboard key highlight

gui/pages.cpp

diff --git a/gui/pages.cpp b/gui/pages.cpp
index 7e9274d..c4a65b4 100644
--- a/gui/pages.cpp
+++ b/gui/pages.cpp
@@ -54,17 +54,24 @@
     if (str[0] != '#')          return -1;
     str.erase(0, 1);
 
-    int result = strtol(str.c_str(), NULL, 16);
-    if (str.size() > 6)
-    {
-        // We have alpha channel
-        color->alpha = result & 0x000000FF;
-        result = result >> 8;
-    }
-    color->red = (result >> 16) & 0x000000FF;
-    color->green = (result >> 8) & 0x000000FF;
-    color->blue = result & 0x000000FF;
-    return 0;
+	int result;
+	if (str.size() >= 8) {
+		// We have alpha channel
+		string alpha = str.substr(6, 2);
+		result = strtol(alpha.c_str(), NULL, 16);
+		color->alpha = result & 0x000000FF;
+		str.resize(6);
+		result = strtol(str.c_str(), NULL, 16);
+		color->red = (result >> 16) & 0x000000FF;
+		color->green = (result >> 8) & 0x000000FF;
+		color->blue = result & 0x000000FF;
+	} else {
+		result = strtol(str.c_str(), NULL, 16);
+		color->red = (result >> 16) & 0x000000FF;
+		color->green = (result >> 8) & 0x000000FF;
+		color->blue = result & 0x000000FF;
+	}
+	return 0;
 }
 
 // Helper APIs