added native pane splitter rendering
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -32,6 +32,7 @@
|
|||||||
#endif //WX_PRECOMP
|
#endif //WX_PRECOMP
|
||||||
|
|
||||||
#include "wx/renderer.h"
|
#include "wx/renderer.h"
|
||||||
|
#include "wx/mac/uma.h"
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxRendererMac: our wxRendererNative implementation
|
// wxRendererMac: our wxRendererNative implementation
|
||||||
@@ -240,10 +241,53 @@ wxRendererMac::DrawSplitterSash(wxWindow *win,
|
|||||||
wxOrientation orient,
|
wxOrientation orient,
|
||||||
int WXUNUSED(flags))
|
int WXUNUSED(flags))
|
||||||
{
|
{
|
||||||
// VZ: we have to somehow determine if we're drawing a normal sash or
|
#if ( TARGET_API_MAC_OSX == 1 ) && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 )
|
||||||
// a brushed metal one as they look quite differently... this is
|
if ( UMAGetSystemVersion() >= 0x1030 )
|
||||||
// completely bogus anyhow, of course (TODO)
|
{
|
||||||
|
bool hasMetal = win->MacGetTopLevelWindow()->MacGetMetalAppearance() ;
|
||||||
|
SInt32 height ;
|
||||||
|
GetThemeMetric( kThemeMetricSmallPaneSplitterHeight , &height ) ;
|
||||||
|
HIRect splitterRect ;
|
||||||
|
if ( orient == wxVERTICAL )
|
||||||
|
splitterRect = CGRectMake( position , 0 , height, size.y);
|
||||||
|
else
|
||||||
|
splitterRect = CGRectMake( 0 , position , size.x , height );
|
||||||
|
HIViewConvertRect( &splitterRect , (HIViewRef) win->GetHandle() , (HIViewRef) win->MacGetTopLevelWindow()->GetHandle() ) ;
|
||||||
|
|
||||||
|
// 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
|
||||||
|
|
||||||
|
if ( dc.IsKindOf( CLASSINFO( wxPaintDC ) ) == false )
|
||||||
|
{
|
||||||
|
Rect r = { splitterRect.origin.y , splitterRect.origin.x ,
|
||||||
|
splitterRect.origin.y + splitterRect.size.height , splitterRect.origin.x + splitterRect.size.width } ;
|
||||||
|
RgnHandle updateRgn = NewRgn() ;
|
||||||
|
RectRgn( updateRgn , &r ) ;
|
||||||
|
HIViewSetNeedsDisplayInRegion( (HIViewRef) win->GetHandle() , updateRgn , true ) ;
|
||||||
|
DisposeRgn( updateRgn ) ;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
CGContextRef cgContext ;
|
||||||
|
Rect bounds ;
|
||||||
|
GetPortBounds( (CGrafPtr) dc.m_macPort , &bounds ) ;
|
||||||
|
QDBeginCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ;
|
||||||
|
CGContextTranslateCTM( cgContext , 0 , bounds.bottom - bounds.top ) ;
|
||||||
|
CGContextScaleCTM( cgContext , 1 , -1 ) ;
|
||||||
|
|
||||||
|
{
|
||||||
|
HIThemeSplitterDrawInfo drawInfo ;
|
||||||
|
drawInfo.version = 0 ;
|
||||||
|
drawInfo.state = kThemeStateActive ;
|
||||||
|
drawInfo.adornment = hasMetal ? kHIThemeSplitterAdornmentMetal : kHIThemeSplitterAdornmentNone ;
|
||||||
|
HIThemeDrawPaneSplitter( &splitterRect , &drawInfo , cgContext , kHIThemeOrientationNormal ) ;
|
||||||
|
}
|
||||||
|
QDEndCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
{
|
||||||
#if 0
|
#if 0
|
||||||
dc.SetPen(*wxLIGHT_GREY_PEN);
|
dc.SetPen(*wxLIGHT_GREY_PEN);
|
||||||
dc.SetBrush(*wxWHITE_BRUSH);
|
dc.SetBrush(*wxWHITE_BRUSH);
|
||||||
@@ -279,5 +323,6 @@ wxRendererMac::DrawSplitterSash(wxWindow *win,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user