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

Improve splitter appearance in wxOSX/Cocoa.

Browse Source 
Try to imitate NSSplitView better.

Closes #12921.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-10-28 01:08:28 +00:00
parent 294de5ca86
commit 031847a206
1 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@
#include "wx/renderer.h" #include "wx/renderer.h"
#include "wx/graphics.h" #include "wx/graphics.h"
#include "wx/dcgraph.h" #include "wx/dcgraph.h"
#include "wx/splitter.h"
#include "wx/osx/private.h" #include "wx/osx/private.h"
#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP #ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
@@ -123,6 +124,8 @@ public:
int flags = 0); int flags = 0);
#endif // wxHAS_DRAW_TITLE_BAR_BITMAP #endif // wxHAS_DRAW_TITLE_BAR_BITMAP
virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
private: private:
void DrawMacThemeButton(wxWindow *win, void DrawMacThemeButton(wxWindow *win,
wxDC& dc, wxDC& dc,
@@ -279,6 +282,37 @@ void wxRendererMac::DrawTreeItemButton( wxWindow *win,
} }
} }
wxSplitterRenderParams
wxRendererMac::GetSplitterParams(const wxWindow *win)
{
// see below
SInt32 sashWidth,
border;
#if wxOSX_USE_COCOA
if ( win->HasFlag(wxSP_3DSASH) )
GetThemeMetric( kThemeMetricPaneSplitterHeight, &sashWidth ); // Cocoa == Carbon == 7
else if ( win->HasFlag(wxSP_NOSASH) ) // actually Cocoa doesn't allow 0
sashWidth = 0;
else // no 3D effect - Cocoa [NSSplitView dividerThickNess] for NSSplitViewDividerStyleThin
sashWidth = 1;
#else // Carbon
if ( win->HasFlag(wxSP_3DSASH) )
GetThemeMetric( kThemeMetricPaneSplitterHeight, &sashWidth );
else if ( win->HasFlag(wxSP_NOSASH) )
sashWidth = 0;
else // no 3D effect
GetThemeMetric( kThemeMetricSmallPaneSplitterHeight, &sashWidth );
#endif // Cocoa/Carbon
if ( win->HasFlag(wxSP_3DBORDER) )
border = 2;
else // no 3D effect
border = 0;
return wxSplitterRenderParams(sashWidth, border, false);
}
void wxRendererMac::DrawSplitterSash( wxWindow *win, void wxRendererMac::DrawSplitterSash( wxWindow *win,
wxDC& dc, wxDC& dc,
const wxSize& size, const wxSize& size,
@@ -288,7 +322,9 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win,
{ {
bool hasMetal = win->MacGetTopLevelWindow()->GetExtraStyle() & wxFRAME_EX_METAL; bool hasMetal = win->MacGetTopLevelWindow()->GetExtraStyle() & wxFRAME_EX_METAL;
SInt32 height; SInt32 height;
GetThemeMetric( kThemeMetricSmallPaneSplitterHeight, &height );
height = wxRendererNative::Get().GetSplitterParams(win).widthSash;
HIRect splitterRect; HIRect splitterRect;
if (orient == wxVERTICAL) if (orient == wxVERTICAL)
splitterRect = CGRectMake( position, 0, height, size.y ); splitterRect = CGRectMake( position, 0, height, size.y );
@@ -323,11 +359,14 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win,
CGContextFillRect(cgContext,splitterRect); CGContextFillRect(cgContext,splitterRect);
} }
HIThemeSplitterDrawInfo drawInfo; if ( win->HasFlag(wxSP_3DSASH) )
drawInfo.version = 0; {
drawInfo.state = kThemeStateActive; HIThemeSplitterDrawInfo drawInfo;
drawInfo.adornment = hasMetal ? kHIThemeSplitterAdornmentMetal : kHIThemeSplitterAdornmentNone; drawInfo.version = 0;
HIThemeDrawPaneSplitter( &splitterRect, &drawInfo, cgContext, kHIThemeOrientationNormal ); drawInfo.state = kThemeStateActive;
drawInfo.adornment = hasMetal ? kHIThemeSplitterAdornmentMetal : kHIThemeSplitterAdornmentNone;
HIThemeDrawPaneSplitter( &splitterRect, &drawInfo, cgContext, kHIThemeOrientationNormal );
}
} }
} }