X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4c9483436ce814a85f595c27fcb02f83bcc2c5ad..23ad132ca3c6a24adab549e21d9cfc30ddc80e6d:/src/mac/carbon/renderer.cpp?ds=inline diff --git a/src/mac/carbon/renderer.cpp b/src/mac/carbon/renderer.cpp index cfa3a81385..685b8e1a68 100644 --- a/src/mac/carbon/renderer.cpp +++ b/src/mac/carbon/renderer.cpp @@ -6,7 +6,7 @@ // Created: 20.07.2003 // RCS-ID: $Id$ // Copyright: (c) 2003 Vadim Zeitlin -// License: wxWindows license +// License: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -32,6 +32,9 @@ #endif //WX_PRECOMP #include "wx/renderer.h" +#include "wx/toplevel.h" +#include "wx/dcclient.h" +#include "wx/mac/uma.h" // ---------------------------------------------------------------------------- // wxRendererMac: our wxRendererNative implementation @@ -56,7 +59,9 @@ public: virtual void DrawSplitterSash(wxWindow *win, wxDC& dc, const wxSize& size, - wxCoord position); + wxCoord position, + wxOrientation orient, + int flags = 0); private: // the tree buttons @@ -117,7 +122,7 @@ static const char *aqua_arrow_down_xpm[] = { // ============================================================================ /* static */ -wxRendererNative& wxRendererNative::Get() +wxRendererNative& wxRendererNative::GetDefault() { static wxRendererMac s_rendererMac; @@ -128,32 +133,80 @@ void wxRendererMac::DrawHeaderButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int WXUNUSED(flags)) + int flags) { - const int CORNER = 1; - - const wxCoord x = rect.x, - y = rect.y, + const wxCoord x = rect.x-1, + y = rect.y-1, w = rect.width, h = rect.height; - dc.SetBrush( *wxTRANSPARENT_BRUSH ); - - dc.SetPen( wxPen( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNSHADOW ) , 1 , wxSOLID ) ); - dc.DrawLine( x+w-CORNER+1, y, x+w, y+h ); // right (outer) - dc.DrawRectangle( x, y+h, w+1, 1 ); // bottom (outer) - - wxPen pen( wxColour( 0x88 , 0x88 , 0x88 ), 1, wxSOLID ); + int major,minor; + wxGetOsVersion( &major, &minor ); - dc.SetPen( pen ); - dc.DrawLine( x+w-CORNER, y, x+w-1, y+h ); // right (inner) - dc.DrawRectangle( x+1, y+h-1, w-2, 1 ); // bottom (inner) + dc.SetBrush( *wxTRANSPARENT_BRUSH ); - dc.SetPen( *wxWHITE_PEN ); - dc.DrawRectangle( x, y, w-CORNER+1, 1 ); // top (outer) - dc.DrawRectangle( x, y, 1, h ); // left (outer) - dc.DrawLine( x, y+h-1, x+1, y+h-1 ); - dc.DrawLine( x+w-1, y, x+w-1, y+1 ); +#if defined(__WXMAC_OSX__) && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 ) + if ( HIThemeDrawButton != 0 ) + { + HIRect headerRect = CGRectMake( x , y , w , h ); + if ( dc.IsKindOf( CLASSINFO( wxPaintDC ) ) == false ) + { + Rect r = { (short) headerRect.origin.y , (short) headerRect.origin.x , + (short) (headerRect.origin.y + headerRect.size.height) , (short) (headerRect.origin.x + headerRect.size.width) } ; + RgnHandle updateRgn = NewRgn() ; + RectRgn( updateRgn , &r ) ; + HIViewSetNeedsDisplayInRegion( (HIViewRef) win->GetHandle() , updateRgn , true ) ; + DisposeRgn( updateRgn ) ; + } + else + { + CGContextRef cgContext ; +#if wxMAC_USE_CORE_GRAPHICS + cgContext = dynamic_cast(dc.GetGraphicContext())->GetNativeContext() ; +#else + 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 ) ; + HIViewConvertRect( &headerRect , (HIViewRef) win->GetHandle() , (HIViewRef) win->MacGetTopLevelWindow()->GetHandle() ) ; +#endif + { + HIThemeButtonDrawInfo drawInfo ; + HIRect labelRect ; + memset( &drawInfo , 0 , sizeof(drawInfo) ) ; + drawInfo.version = 0 ; + drawInfo.state = ( flags & wxCONTROL_DISABLED ) ? kThemeStateInactive : kThemeStateActive ; + drawInfo.kind = kThemeListHeaderButton ; + drawInfo.value = 0 ; + drawInfo.adornment = kThemeAdornmentNone ; + HIThemeDrawButton( &headerRect , &drawInfo , cgContext , kHIThemeOrientationNormal , &labelRect ) ; + } +#if wxMAC_USE_CORE_GRAPHICS +#else + QDEndCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ; +#endif + } + } + else +#endif + { + wxMacWindowClipper clipper(win) ; + Rect rect = { y , x , y + h , x + w } ; + wxPoint origin = win->GetClientAreaOrigin() ; + int dx , dy ; + dx = origin.x ; + dy = origin.y ; + win->MacWindowToRootWindow( &dx , &dy ) ; + OffsetRect( &rect , dx , dy ) ; + + ThemeButtonDrawInfo drawInfo ; + memset( &drawInfo , 0 , sizeof(drawInfo) ) ; + drawInfo.state = ( flags & wxCONTROL_DISABLED ) ? kThemeStateInactive : kThemeStateActive ; + drawInfo.value = 0 ; + drawInfo.adornment = kThemeAdornmentNone ; + DrawThemeButton( &rect , kThemeListHeaderButton , &drawInfo , NULL , NULL , NULL , 0 ) ; + } } void @@ -198,16 +251,91 @@ void wxRendererMac::DrawSplitterSash(wxWindow *win, wxDC& dc, const wxSize& size, - wxCoord position) + wxCoord position, + wxOrientation orient, + int WXUNUSED(flags)) { - // VZ: we have to somehow determine if we're drawing a normal sash or - // a brushed metal one as they look quite differently... this is - // completely bogus anyhow, of course (TODO) +#if defined(__WXMAC_OSX__) && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 ) + if ( HIThemeDrawPaneSplitter != 0 ) + { + 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 ); +#if !wxMAC_USE_CORE_GRAPHICS + HIViewConvertRect( &splitterRect , (HIViewRef) win->GetHandle() , (HIViewRef) win->MacGetTopLevelWindow()->GetHandle() ) ; +#endif + + // 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 = { (short) splitterRect.origin.y , (short) splitterRect.origin.x , + (short) (splitterRect.origin.y + splitterRect.size.height) , (short) (splitterRect.origin.x + splitterRect.size.width) } ; + RgnHandle updateRgn = NewRgn() ; + RectRgn( updateRgn , &r ) ; + HIViewSetNeedsDisplayInRegion( (HIViewRef) win->GetHandle() , updateRgn , true ) ; + DisposeRgn( updateRgn ) ; + } + else + { + CGContextRef cgContext ; +#if wxMAC_USE_CORE_GRAPHICS + cgContext = dynamic_cast(dc.GetGraphicContext())->GetNativeContext() ; +#else + 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 ) ; +#endif - const wxCoord h = size.y; + HIThemeSplitterDrawInfo drawInfo ; + drawInfo.version = 0 ; + drawInfo.state = kThemeStateActive ; + drawInfo.adornment = hasMetal ? kHIThemeSplitterAdornmentMetal : kHIThemeSplitterAdornmentNone ; + HIThemeDrawPaneSplitter( &splitterRect , &drawInfo , cgContext , kHIThemeOrientationNormal ) ; - dc.SetPen(*wxLIGHT_GREY_PEN); - dc.SetBrush(*wxWHITE_BRUSH); - dc.DrawRectangle(position, 0, 7, h); +#if wxMAC_USE_CORE_GRAPHICS +#else + QDEndCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ; +#endif + } + } + else +#endif + { + // Do the gradient fill: + static int grayValues[] = + { + 0xA0, 0xF6, 0xED, 0xE4, 0xE2, 0xD0, 0xA0 + }; + dc.SetBrush( *wxTRANSPARENT_BRUSH ); + if ( orient == wxVERTICAL ) + { + int i; + for (i=0; i < (int)WXSIZEOF(grayValues); i++) + { + dc.SetPen( wxPen( wxColour( grayValues[i] , grayValues[i] , grayValues[i] ), + 1 , wxSOLID ) ); + dc.DrawRectangle( position+i, 0, 1, size.y ); + } + } + else + { + int i; + for (i=0; i < (int)WXSIZEOF(grayValues); i++) + { + dc.SetPen( wxPen( wxColour( grayValues[i] , grayValues[i] , grayValues[i] ), + 1 , wxSOLID ) ); + dc.DrawRectangle( 0, position+i, size.x, 1 ); + } + } + } }