From 8bc0ed06cbf38e989142254c8d853d87ee30e818 Mon Sep 17 00:00:00 2001 From: Felix Rabe Date: Sun, 14 Jul 2019 23:20:33 +0200 Subject: [PATCH] Fix NSColor argument order: r b<->g --- cocoa/examples/color.rs | 12 ++++++------ cocoa/src/appkit.rs | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cocoa/examples/color.rs b/cocoa/examples/color.rs index 2cacbfc..af31514 100644 --- a/cocoa/examples/color.rs +++ b/cocoa/examples/color.rs @@ -16,11 +16,11 @@ fn main() { // Create some colors let clear = NSColor::clearColor(nil); - let black = NSColor::colorWithRed_blue_green_alpha_(nil, 0.0, 0.0, 0.0, 1.0); - let srgb_red = NSColor::colorWithSRGBRed_blue_green_alpha_(nil, 1.0, 0.0, 0.0, 1.0); - let device_green = NSColor::colorWithDeviceRed_blue_green_alpha_(nil, 0.0, 1.0, 0.0, 1.0); - let display_p3_blue = NSColor::colorWithDisplayP3Red_blue_green_alpha_(nil, 0.0, 0.0, 1.0, 1.0); - let calibrated_cyan = NSColor::colorWithCalibratedRed_blue_green_alpha_(nil, 0.0, 1.0, 1.0, 1.0); + let black = NSColor::colorWithRed_green_blue_alpha_(nil, 0.0, 0.0, 0.0, 1.0); + let srgb_red = NSColor::colorWithSRGBRed_green_blue_alpha_(nil, 1.0, 0.0, 0.0, 1.0); + let device_green = NSColor::colorWithDeviceRed_green_blue_alpha_(nil, 0.0, 1.0, 0.0, 1.0); + let display_p3_blue = NSColor::colorWithDisplayP3Red_green_blue_alpha_(nil, 0.0, 0.0, 1.0, 1.0); + let calibrated_cyan = NSColor::colorWithCalibratedRed_green_blue_alpha_(nil, 0.0, 1.0, 1.0, 1.0); // Create windows with different color types. let _win_clear = create_window(NSString::alloc(nil).init_str("clear"), clear); @@ -34,7 +34,7 @@ fn main() { // NOTE: some components will raise an exception if the color is not // in the correct NSColorSpace. Refer to Apple's documentation for details. // https://developer.apple.com/documentation/appkit/nscolor?language=objc - let my_color = NSColor::colorWithRed_blue_green_alpha_(nil, 0.25, 0.75, 0.5, 0.25); + let my_color = NSColor::colorWithRed_green_blue_alpha_(nil, 0.25, 0.75, 0.5, 0.25); println!("alphaComponent: {:?}", my_color.alphaComponent()); println!("redComponent: {:?}", my_color.redComponent()); println!("greenComponent: {:?}", my_color.greenComponent()); diff --git a/cocoa/src/appkit.rs b/cocoa/src/appkit.rs index cd2dc15..46d0e57 100644 --- a/cocoa/src/appkit.rs +++ b/cocoa/src/appkit.rs @@ -3953,11 +3953,11 @@ impl NSColorSpace for id { pub trait NSColor: Sized { unsafe fn clearColor(_: Self) -> id; - unsafe fn colorWithRed_blue_green_alpha_(_:Self, r: CGFloat, b: CGFloat, g: CGFloat, a: CGFloat) -> id; - unsafe fn colorWithSRGBRed_blue_green_alpha_(_:Self, r: CGFloat, b: CGFloat, g: CGFloat, a: CGFloat) -> id; - unsafe fn colorWithDeviceRed_blue_green_alpha_(_:Self, r: CGFloat, b: CGFloat, g: CGFloat, a: CGFloat) -> id; - unsafe fn colorWithDisplayP3Red_blue_green_alpha_(_:Self, r: CGFloat, b: CGFloat, g: CGFloat, a: CGFloat) -> id; - unsafe fn colorWithCalibratedRed_blue_green_alpha_(_:Self, r: CGFloat, b: CGFloat, g: CGFloat, a: CGFloat) -> id; + unsafe fn colorWithRed_green_blue_alpha_(_:Self, r: CGFloat, g: CGFloat, b: CGFloat, a: CGFloat) -> id; + unsafe fn colorWithSRGBRed_green_blue_alpha_(_:Self, r: CGFloat, g: CGFloat, b: CGFloat, a: CGFloat) -> id; + unsafe fn colorWithDeviceRed_green_blue_alpha_(_:Self, r: CGFloat, g: CGFloat, b: CGFloat, a: CGFloat) -> id; + unsafe fn colorWithDisplayP3Red_green_blue_alpha_(_:Self, r: CGFloat, g: CGFloat, b: CGFloat, a: CGFloat) -> id; + unsafe fn colorWithCalibratedRed_green_blue_alpha_(_:Self, r: CGFloat, g: CGFloat, b: CGFloat, a: CGFloat) -> id; unsafe fn colorUsingColorSpace_(self, color_space: id) -> id; @@ -3979,19 +3979,19 @@ impl NSColor for id { unsafe fn clearColor(_: Self) -> id { msg_send![class!(NSColor), clearColor] } - unsafe fn colorWithRed_blue_green_alpha_(_:Self, r: CGFloat, b: CGFloat, g: CGFloat, a: CGFloat) -> id { + unsafe fn colorWithRed_green_blue_alpha_(_:Self, r: CGFloat, g: CGFloat, b: CGFloat, a: CGFloat) -> id { msg_send![class!(NSColor), colorWithRed:r green:g blue:b alpha:a] } - unsafe fn colorWithSRGBRed_blue_green_alpha_(_:Self, r: CGFloat, b: CGFloat, g: CGFloat, a: CGFloat) -> id { + unsafe fn colorWithSRGBRed_green_blue_alpha_(_:Self, r: CGFloat, g: CGFloat, b: CGFloat, a: CGFloat) -> id { msg_send![class!(NSColor), colorWithSRGBRed:r green:g blue:b alpha:a] } - unsafe fn colorWithDeviceRed_blue_green_alpha_(_:Self, r: CGFloat, b: CGFloat, g: CGFloat, a: CGFloat) -> id { + unsafe fn colorWithDeviceRed_green_blue_alpha_(_:Self, r: CGFloat, g: CGFloat, b: CGFloat, a: CGFloat) -> id { msg_send![class!(NSColor), colorWithDeviceRed:r green:g blue:b alpha:a] } - unsafe fn colorWithDisplayP3Red_blue_green_alpha_(_:Self, r: CGFloat, b: CGFloat, g: CGFloat, a: CGFloat) -> id { + unsafe fn colorWithDisplayP3Red_green_blue_alpha_(_:Self, r: CGFloat, g: CGFloat, b: CGFloat, a: CGFloat) -> id { msg_send![class!(NSColor), colorWithDisplayP3Red:r green:g blue:b alpha:a] } - unsafe fn colorWithCalibratedRed_blue_green_alpha_(_:Self, r: CGFloat, b: CGFloat, g: CGFloat, a: CGFloat) -> id { + unsafe fn colorWithCalibratedRed_green_blue_alpha_(_:Self, r: CGFloat, g: CGFloat, b: CGFloat, a: CGFloat) -> id { msg_send![class!(NSColor), colorWithCalibratedRed:r green:g blue:b alpha:a] }