Merge pull request escoz#485 from SSheldon/master

Fix QColorPickerElement getImageFromItem: method
IOSMonkey · Apr 29, 2013 · b610b14 · b610b14
2 parents dfbd70c + 0a0abfe
commit b610b14
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/quickdialog/QColorPickerElement.m b/quickdialog/QColorPickerElement.m
@@ -17,8 +17,9 @@ - (QColorPickerElement *)init {
         self.items = @[
                 @[@"Black", [UIColor blackColor]],
                 @[@"White", [UIColor whiteColor]],
-                @[@"Blue", [UIColor grayColor]],
-                @[@"Red",  [UIColor blueColor]],
+                @[@"Gray", [UIColor grayColor]],
+                @[@"Blue",  [UIColor blueColor]],
+                @[@"Red",  [UIColor redColor]],
                 @[@"Green", [UIColor greenColor]],
                 @[@"Yellow", [UIColor yellowColor]],
                 @[@"Purple", [UIColor purpleColor]],
@@ -44,7 +45,7 @@ - (void)updateCell:(QEntryTableViewCell *)cell selectedValue:(id)selectedValue {
 }
 
 - (UIImage *)getImageFromItem:(NSArray *)selectedValue {
-    id color = [[selectedValue objectAtIndex:1] description];
+    id color = [selectedValue objectAtIndex:1];
     if ([color isKindOfClass:[UIColor class]])
         return [color imageByDrawingCircleOfColor];
     if ([color isKindOfClass:[NSString class]])