From 81f7847af4cc9f51f02ab191c73f394c457518bd Mon Sep 17 00:00:00 2001 From: Neil Date: Sun, 25 Apr 2021 09:52:20 +1000 Subject: Feature [feature-requests:#1402]. Unify colour type with ColourAlpha. Change ColourDesired to ColourAlpha in styles. Remove ColourDesired. --- cocoa/PlatCocoa.mm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'cocoa') diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm index 50e42f38e..100ea44b0 100644 --- a/cocoa/PlatCocoa.mm +++ b/cocoa/PlatCocoa.mm @@ -741,7 +741,7 @@ void SurfaceImpl::FillRectangle(PRectangle rc, Surface &surfacePattern) { // For now, assume that copy can only be called on PixMap surfaces. Shows up black. CGImageRef image = patternSurface.CreateImage(); if (image == NULL) { - FillRectangle(rc, ColourDesired(0)); + FillRectangle(rc, ColourAlpha::FromRGB(0)); return; } @@ -1147,7 +1147,7 @@ void SurfaceImpl::Copy(PRectangle rc, Scintilla::Point from, Surface &surfaceSou CGImageRef image = source.CreateImage(); // If we could not get an image reference, fill the rectangle black if (image == NULL) { - FillRectangle(rc, ColourDesired(0)); + FillRectangle(rc, ColourAlpha::FromRGB(0)); return; } @@ -2287,14 +2287,14 @@ void Menu::Show(Point, const Window &) { //----------------- Platform ----------------------------------------------------------------------- -ColourDesired Platform::Chrome() { - return ColourDesired(0xE0, 0xE0, 0xE0); +ColourAlpha Platform::Chrome() { + return ColourAlpha(0xE0, 0xE0, 0xE0); } //-------------------------------------------------------------------------------------------------- -ColourDesired Platform::ChromeHighlight() { - return ColourDesired(0xFF, 0xFF, 0xFF); +ColourAlpha Platform::ChromeHighlight() { + return ColourAlpha(0xFF, 0xFF, 0xFF); } //-------------------------------------------------------------------------------------------------- -- cgit v1.2.3