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

Fix drawing outside of the splitter sash under macOS

Browse Source 
Take into account the extra border when using wxSP_3DBORDER.

Closes #18861.
This commit is contained in:
Andreas Falkenhahn
2020-12-05 22:45:13 +01:00
committed by Vadim Zeitlin
parent 701334a3ba
commit 04a7a3f150
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -348,11 +348,14 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win,
height = wxRendererNative::Get().GetSplitterParams(win).widthSash; height = wxRendererNative::Get().GetSplitterParams(win).widthSash;
// Do not draw over border drawn by wxRendererGeneric::DrawSplitterBorder()
const wxCoord borderAdjust = win->HasFlag(wxSP_3DBORDER) ? 2 : 0;
HIRect splitterRect; HIRect splitterRect;
if (orient == wxVERTICAL) if (orient == wxVERTICAL)
splitterRect = CGRectMake( position, 0, height, size.y ); splitterRect = CGRectMake( position, borderAdjust, height, size.y - borderAdjust );
else else
splitterRect = CGRectMake( 0, position, size.x, height ); splitterRect = CGRectMake( borderAdjust, position, size.x - borderAdjust, height );
// under compositing we should only draw when called by the OS, otherwise just issue a redraw command // under compositing we should only draw when called by the OS, otherwise just issue a redraw command
// strange redraw errors occur if we don't do this // strange redraw errors occur if we don't do this