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

Dark Mode for wxRenderer for HeaderButtons and Sashes

Browse Source 
see #18146
This commit is contained in:
Stefan Csomor
2018-06-17 18:39:01 +02:00
parent d2aafff4a2
commit 805db8baa8
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/osx/carbon/renderer.cpp
View File

@@ -172,6 +172,11 @@ int wxRendererMac::DrawHeaderButton( wxWindow *win,
wxHeaderSortIconType sortArrow, wxHeaderSortIconType sortArrow,
wxHeaderButtonParams* params ) wxHeaderButtonParams* params )
{ {
if ( wxPlatformInfo::Get().CheckOSVersion(10, 14) )
{
if ( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW).Red() < 128 )
return wxRendererNative::GetGeneric().DrawHeaderButton(win, dc, rect, flags, sortArrow, params);
}
const wxCoord x = rect.x; const wxCoord x = rect.x;
const wxCoord y = rect.y; const wxCoord y = rect.y;
const wxCoord w = rect.width; const wxCoord w = rect.width;
@@ -334,7 +339,7 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win,
wxOrientation orient, wxOrientation orient,
int WXUNUSED(flags) ) int WXUNUSED(flags) )
{ {
bool hasMetal = win->MacGetTopLevelWindow()->GetExtraStyle() & wxFRAME_EX_METAL; bool hasMetal = win->MacGetTopLevelWindow()->GetExtraStyle() & wxFRAME_EX_METAL && !wxPlatformInfo::Get().CheckOSVersion(10, 14);
SInt32 height; SInt32 height;
height = wxRendererNative::Get().GetSplitterParams(win).widthSash; height = wxRendererNative::Get().GetSplitterParams(win).widthSash;
@@ -360,13 +365,15 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win,
wxGCDCImpl *impl = (wxGCDCImpl*) dc.GetImpl(); wxGCDCImpl *impl = (wxGCDCImpl*) dc.GetImpl();
cgContext = (CGContextRef) impl->GetGraphicsContext()->GetNativeContext(); cgContext = (CGContextRef) impl->GetGraphicsContext()->GetNativeContext();
if ( hasMetal )
{
HIThemeBackgroundDrawInfo bgdrawInfo; HIThemeBackgroundDrawInfo bgdrawInfo;
bgdrawInfo.version = 0; bgdrawInfo.version = 0;
bgdrawInfo.state = kThemeStateActive; bgdrawInfo.state = kThemeStateActive;
bgdrawInfo.kind = hasMetal ? kThemeBackgroundMetal : kThemeBackgroundPlacard; bgdrawInfo.kind = hasMetal ? kThemeBackgroundMetal : kThemeBackgroundPlacard;
if ( hasMetal )
HIThemeDrawBackground(&splitterRect, &bgdrawInfo, cgContext, kHIThemeOrientationNormal); HIThemeDrawBackground(&splitterRect, &bgdrawInfo, cgContext, kHIThemeOrientationNormal);
}
else else
{ {
CGContextSetFillColorWithColor(cgContext,win->GetBackgroundColour().GetCGColor()); CGContextSetFillColorWithColor(cgContext,win->GetBackgroundColour().GetCGColor());
@@ -374,6 +381,8 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win,
} }
if ( win->HasFlag(wxSP_3DSASH) ) if ( win->HasFlag(wxSP_3DSASH) )
{
if ( !wxPlatformInfo::Get().CheckOSVersion(10, 14) || wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW).Red() > 128 )
{ {
HIThemeSplitterDrawInfo drawInfo; HIThemeSplitterDrawInfo drawInfo;
drawInfo.version = 0; drawInfo.version = 0;
@@ -382,6 +391,7 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win,
HIThemeDrawPaneSplitter( &splitterRect, &drawInfo, cgContext, kHIThemeOrientationNormal ); HIThemeDrawPaneSplitter( &splitterRect, &drawInfo, cgContext, kHIThemeOrientationNormal );
} }
} }
}
} }
void void