diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2023-02-23 09:59:15 +1100 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2023-02-23 09:59:15 +1100 |
| commit | e970ce3081def3ef12bfa804593dc9a1b2778041 (patch) | |
| tree | 8d62b9557ce9b1f1230f61ac2914fcf42b061827 | |
| parent | 43d0f3772991b163d11693e805efaaa700b4f745 (diff) | |
| download | scintilla-mirror-e970ce3081def3ef12bfa804593dc9a1b2778041.tar.gz | |
Replace deprecated colorUsingColorSpaceName with colorUsingColorSpace.
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index 4823f4b8b..5b3d1178c 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -2602,10 +2602,11 @@ void ScintillaCocoa::UpdateBaseElements() { bool changed = false; if (@available(macOS 10.14, *)) { - NSColor *textBack = [NSColor.textBackgroundColor colorUsingColorSpaceName: NSCalibratedRGBColorSpace]; - NSColor *noFocusBack = [NSColor.unemphasizedSelectedTextBackgroundColor colorUsingColorSpaceName: NSCalibratedRGBColorSpace]; + NSColorSpace *colorSpace = [NSColorSpace genericRGBColorSpace]; + NSColor *textBack = [NSColor.textBackgroundColor colorUsingColorSpace: colorSpace]; + NSColor *noFocusBack = [NSColor.unemphasizedSelectedTextBackgroundColor colorUsingColorSpace: colorSpace]; if (vs.selection.layer == Layer::Base) { - NSColor *selBack = [NSColor.selectedTextBackgroundColor colorUsingColorSpaceName: NSCalibratedRGBColorSpace]; + NSColor *selBack = [NSColor.selectedTextBackgroundColor colorUsingColorSpace: colorSpace]; // Additional selection: blend with text background to make weaker version. NSColor *modified = [selBack blendedColorWithFraction:0.5 ofColor:textBack]; changed = vs.SetElementBase(Element::SelectionBack, ColourFromNSColor(selBack)); @@ -2615,7 +2616,7 @@ void ScintillaCocoa::UpdateBaseElements() { // Less translucent colour used in dark mode as otherwise less visible const int alpha = textBack.brightnessComponent > 0.5 ? 0x40 : 0x60; // Make a translucent colour that approximates selectedTextBackgroundColor - NSColor *accent = [NSColor.controlAccentColor colorUsingColorSpaceName: NSCalibratedRGBColorSpace]; + NSColor *accent = [NSColor.controlAccentColor colorUsingColorSpace: colorSpace]; const ColourRGBA colourAccent = ColourFromNSColor(accent); changed = vs.SetElementBase(Element::SelectionBack, ColourRGBA(colourAccent, alpha)); changed = vs.SetElementBase(Element::SelectionAdditionalBack, ColourRGBA(colourAccent, alpha/2)) || changed; |