Merge pull request livecode#1601 from runrevsebastien/bugfix-14098

livecodesebastien · livecodesebastien · commit 77b6b4e03b4e · 2014-12-12T17:06:15.000Z
Bugfix 14098
diff --git a/engine/src/mac-dialog.mm b/engine/src/mac-dialog.mm
@@ -840,7 +840,11 @@ -(void) getColor
     {
         NSColor *t_color;
         
-        t_color = [[mColorPanel color] colorUsingColorSpaceName: NSCalibratedRGBColorSpace];
+        // Do not calibrate the colour. As stated in the doc for -colorUsingColorSpace
+        //   "The new NSColor object. This method converts the receiver's color to an equivalent
+        //    one in the new color space. Although the new color might have different component
+        //    values, it looks the same as the original."
+        t_color = [mColorPanel color];
         
         // Convert the value from to a colour component value.
         s_color_dialog_color . red   = (uint2) ([t_color redComponent] * UINT16_MAX);
@@ -899,10 +903,10 @@ void MCPlatformBeginColorDialog(const char *p_title, const MCColor& p_color)
     
     // SN-2014-11-28: [[ Bug 14098 ]] Make use of the initial colour
     CGFloat t_divider = UINT16_MAX;
-    NSColor* t_initial_color = [NSColor colorWithRed:(CGFloat)p_color.red / t_divider
-                                               green:(CGFloat)p_color.green / t_divider
-                                                blue:(CGFloat)p_color.blue / t_divider
-                                               alpha:1];
+    NSColor* t_initial_color = [NSColor colorWithCalibratedRed:(CGFloat)p_color.red / t_divider
+                                                         green:(CGFloat)p_color.green / t_divider
+                                                          blue:(CGFloat)p_color.blue / t_divider
+                                                         alpha:1];
     [t_colorPicker setColor:t_initial_color];
     
     NSView* t_pickerView;
