Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set the appearance when working with wxColour components (#910)

Browse Source
This commit is contained in:
Daniel Kulp
2018-09-01 01:29:11 -04:00
committed by Stefan Csomor
parent d70b515216
commit 0b69ba6459
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/osx/cocoa/colour.mm
View File

@@ -60,6 +60,7 @@ WX_NSColor wxNSColorRefData::GetNSColor() const
CGFloat wxNSColorRefData::Red() const CGFloat wxNSColorRefData::Red() const
{ {
wxOSXEffectiveAppearanceSetter helper;
if ( NSColor* colRGBA = [m_nsColour colorUsingColorSpaceName:NSCalibratedRGBColorSpace] ) if ( NSColor* colRGBA = [m_nsColour colorUsingColorSpaceName:NSCalibratedRGBColorSpace] )
return [colRGBA redComponent]; return [colRGBA redComponent];
@@ -68,6 +69,7 @@ CGFloat wxNSColorRefData::Red() const
CGFloat wxNSColorRefData::Green() const CGFloat wxNSColorRefData::Green() const
{ {
wxOSXEffectiveAppearanceSetter helper;
if ( NSColor* colRGBA = [m_nsColour colorUsingColorSpaceName:NSCalibratedRGBColorSpace] ) if ( NSColor* colRGBA = [m_nsColour colorUsingColorSpaceName:NSCalibratedRGBColorSpace] )
return [colRGBA greenComponent]; return [colRGBA greenComponent];
@@ -76,6 +78,7 @@ CGFloat wxNSColorRefData::Green() const
CGFloat wxNSColorRefData::Blue() const CGFloat wxNSColorRefData::Blue() const
{ {
wxOSXEffectiveAppearanceSetter helper;
if ( NSColor* colRGBA = [m_nsColour colorUsingColorSpaceName:NSCalibratedRGBColorSpace] ) if ( NSColor* colRGBA = [m_nsColour colorUsingColorSpaceName:NSCalibratedRGBColorSpace] )
return [colRGBA blueComponent]; return [colRGBA blueComponent];
@@ -84,6 +87,7 @@ CGFloat wxNSColorRefData::Blue() const
CGFloat wxNSColorRefData::Alpha() const CGFloat wxNSColorRefData::Alpha() const
{ {
wxOSXEffectiveAppearanceSetter helper;
if ( NSColor* colRGBA = [m_nsColour colorUsingColorSpaceName:NSCalibratedRGBColorSpace] ) if ( NSColor* colRGBA = [m_nsColour colorUsingColorSpaceName:NSCalibratedRGBColorSpace] )
return [colRGBA alphaComponent]; return [colRGBA alphaComponent];
@@ -93,8 +97,10 @@ CGFloat wxNSColorRefData::Alpha() const
CGColorRef wxNSColorRefData::GetCGColor() const CGColorRef wxNSColorRefData::GetCGColor() const
{ {
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
if (wxPlatformInfo::Get().CheckOSVersion(10, 8)) if (wxPlatformInfo::Get().CheckOSVersion(10, 8)) {
wxOSXEffectiveAppearanceSetter helper;
return [m_nsColour CGColor]; return [m_nsColour CGColor];
}
#endif #endif
CGColorRef cgcolor = NULL; CGColorRef cgcolor = NULL;
@@ -174,6 +180,7 @@ CGColorRef wxNSColorRefData::GetCGColor() const
WX_NSColor wxColourRefData::GetNSColor() const WX_NSColor wxColourRefData::GetNSColor() const
{ {
wxOSXEffectiveAppearanceSetter helper;
return [NSColor colorWithCalibratedRed:Red() green:Green() blue:Blue() alpha:Alpha() ]; return [NSColor colorWithCalibratedRed:Red() green:Green() blue:Blue() alpha:Alpha() ];
} }