X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..8a16d7370e3cdc7d583a6f14ab11b3a1d27b73df:/src/mac/carbon/renderer.cpp diff --git a/src/mac/carbon/renderer.cpp b/src/mac/carbon/renderer.cpp index 8accb20bdb..802ff8a81e 100644 --- a/src/mac/carbon/renderer.cpp +++ b/src/mac/carbon/renderer.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: mac/renderer.cpp +// Name: src/mac/carbon/renderer.cpp // Purpose: implementation of wxRendererNative for Mac // Author: Vadim Zeitlin // Modified by: @@ -9,14 +9,6 @@ // License: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -29,41 +21,45 @@ #include "wx/dc.h" #include "wx/bitmap.h" #include "wx/settings.h" -#endif //WX_PRECOMP + #include "wx/dcclient.h" + #include "wx/toplevel.h" +#endif #include "wx/renderer.h" +#include "wx/mac/uma.h" -// ---------------------------------------------------------------------------- -// wxRendererMac: our wxRendererNative implementation -// ---------------------------------------------------------------------------- class WXDLLEXPORT wxRendererMac : public wxDelegateRendererNative { public: // draw the header control button (used by wxListCtrl) - virtual void DrawHeaderButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0); + virtual void DrawHeaderButton( wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0, + wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, + wxHeaderButtonParams* params = NULL ); + virtual int GetHeaderButtonHeight(wxWindow *win); + // draw the expanded/collapsed icon for a tree control item - virtual void DrawTreeItemButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0); + virtual void DrawTreeItemButton( wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0 ); // draw a (vertical) sash - virtual void DrawSplitterSash(wxWindow *win, - wxDC& dc, - const wxSize& size, - wxCoord position, - wxOrientation orient, - int flags = 0); + virtual void DrawSplitterSash( wxWindow *win, + wxDC& dc, + const wxSize& size, + wxCoord position, + wxOrientation orient, + int flags = 0 ); private: // the tree buttons - wxBitmap m_bmpTreeExpanded, - m_bmpTreeCollapsed; + wxBitmap m_bmpTreeExpanded; + wxBitmap m_bmpTreeCollapsed; }; // ---------------------------------------------------------------------------- @@ -71,14 +67,16 @@ private: // ---------------------------------------------------------------------------- /* XPM */ -static const char *aqua_arrow_right_xpm[] = { -/* columns rows colors chars-per-pixel */ +static const char *aqua_arrow_right_xpm[] = +{ +// columns rows colors chars-per-pixel "13 11 4 1", " c None", "b c #C0C0C0", "c c #707070", "d c #A0A0A0", -/* pixels */ + +// pixels " b ", " ddb ", " cccdb ", @@ -93,14 +91,16 @@ static const char *aqua_arrow_right_xpm[] = { }; /* XPM */ -static const char *aqua_arrow_down_xpm[] = { -/* columns rows colors chars-per-pixel */ +static const char *aqua_arrow_down_xpm[] = +{ +// columns rows colors chars-per-pixel "13 11 4 1", " c None", "b c #C0C0C0", "c c #707070", "d c #A0A0A0", -/* pixels */ + +// pixels " ", " ", " bdcccccccdb ", @@ -118,7 +118,7 @@ static const char *aqua_arrow_down_xpm[] = { // implementation // ============================================================================ -/* static */ +// static wxRendererNative& wxRendererNative::GetDefault() { static wxRendererMac s_rendererMac; @@ -126,79 +126,123 @@ wxRendererNative& wxRendererNative::GetDefault() return s_rendererMac; } -void -wxRendererMac::DrawHeaderButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int WXUNUSED(flags)) +void wxRendererMac::DrawHeaderButton( wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags, + wxHeaderSortIconType sortArrow, + wxHeaderButtonParams* params ) { - const int CORNER = 1; - - const wxCoord x = rect.x-1, - y = rect.y-1, - w = rect.width, - h = rect.height; - - int major,minor; - wxGetOsVersion( &major, &minor ); + const wxCoord x = dc.XLOG2DEV(rect.x /*- 1*/); + const wxCoord y = dc.YLOG2DEV(rect.y /*- 1*/); + const wxCoord w = dc.XLOG2DEVREL(rect.width); + const wxCoord h = dc.YLOG2DEVREL(rect.height); dc.SetBrush( *wxTRANSPARENT_BRUSH ); - if (major >= 10) + HIRect headerRect = CGRectMake( x, y, w, h ); + if ( !dc.IsKindOf( CLASSINFO( wxPaintDC ) ) ) { - dc.SetPen( wxPen( wxColour( 0xC5 , 0xC5 , 0xC5 ) , 1 , wxSOLID ) ); - dc.DrawRectangle( x, y+CORNER, 1, h-CORNER ); // left - // The right border is overdrawn by the left border of the right neighbouring - // header (to maintain a proper single pixel border). Except for the - // rightmost header of the listctrl. - dc.DrawRectangle( x+w+(CORNER*2), y+CORNER, 1, h-CORNER ); // right - dc.SetPen( wxPen( wxColour( 0xB1 , 0xB1 , 0xB1 ) , 1 , wxSOLID ) ); - dc.DrawRectangle( x, y+h, w+(CORNER*3), 1 ); // bottom - dc.DrawRectangle( x, y, w+(CORNER*3), 1 ); // top - - // Do a fill of the interior for background: - dc.SetPen( wxPen( wxColour( 0xF6 , 0xF6 , 0xF6 ) , 1 , wxSOLID ) ); - dc.DrawRectangle( x+CORNER, y+CORNER, w+CORNER, h-CORNER ); - - // Do the gradient fill: - static int grayValues[] = + Rect r = { - 0xF6, 0xF2, 0xEF, 0xED, 0xED, 0xEB, 0xEA, 0xEA, 0xE8, - 0xE8, 0xE2, 0xE5, 0xE8, 0xEB, 0xEF, 0xF2, 0xFD + (short) headerRect.origin.y, (short) headerRect.origin.x, + (short) (headerRect.origin.y + headerRect.size.height), + (short) (headerRect.origin.x + headerRect.size.width) }; - int i; - for (i=0; i < h && i < (int)WXSIZEOF(grayValues); i++) + + RgnHandle updateRgn = NewRgn(); + RectRgn( updateRgn, &r ); + HIViewSetNeedsDisplayInRegion( (HIViewRef) win->GetHandle(), updateRgn, true ); + DisposeRgn( updateRgn ); + } + else + { + CGContextRef cgContext; + +#if wxMAC_USE_CORE_GRAPHICS + cgContext = ((wxMacCGContext*)(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 ); + + HIShapeReplacePathInCGContext( HIShapeCreateWithQDRgn( (RgnHandle) dc.m_macCurrentClipRgn ), cgContext ); + CGContextClip( cgContext ); + HIViewConvertRect( &headerRect, (HIViewRef) win->GetHandle(), (HIViewRef) win->MacGetTopLevelWindow()->GetHandle() ); +#endif + { - dc.SetPen( wxPen( wxColour( grayValues[i] , grayValues[i] , grayValues[i] ), - 1 , wxSOLID ) ); - dc.DrawRectangle( x+CORNER, y+CORNER+i, w+CORNER, 1 ); + HIThemeButtonDrawInfo drawInfo; + HIRect labelRect; + + memset( &drawInfo, 0, sizeof(drawInfo) ); + drawInfo.version = 0; + drawInfo.kind = kThemeListHeaderButton; + drawInfo.state = (flags & wxCONTROL_DISABLED) ? kThemeStateInactive : kThemeStateActive; + drawInfo.value = (flags & wxCONTROL_SELECTED) ? kThemeButtonOn : kThemeButtonOff; + drawInfo.adornment = kThemeAdornmentNone; + + // The down arrow is drawn automatically, change it to an up arrow if needed. + if ( sortArrow == wxHDR_SORT_ICON_UP ) + drawInfo.adornment = kThemeAdornmentHeaderButtonSortUp; + + HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect ); + + // If we don't want any arrows we need to draw over the one already there + if ( (flags & wxCONTROL_SELECTED) && (sortArrow == wxHDR_SORT_ICON_NONE) ) + { + // clip to the header rectangle + CGContextSaveGState( cgContext ); + CGContextClipToRect( cgContext, headerRect ); + // but draw bigger than that so the arrow will get clipped off + headerRect.size.width += 25; + HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect ); + CGContextRestoreGState( cgContext ); + } } + +#if wxMAC_USE_CORE_GRAPHICS +#else + QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext ); +#endif } - else + + // Reserve room for the arrows before writing the label, and turn off the + // flags we've already handled + wxRect newRect(rect); + if ( (flags & wxCONTROL_SELECTED) && (sortArrow != wxHDR_SORT_ICON_NONE) ) { - 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 ); - - 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.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 ); - } + newRect.width -= 12; + sortArrow = wxHDR_SORT_ICON_NONE; + } + flags &= ~wxCONTROL_SELECTED; + + DrawHeaderButtonContents(win, dc, newRect, flags, sortArrow, params); +} + + +int wxRendererMac::GetHeaderButtonHeight(wxWindow* WXUNUSED(win)) +{ + SInt32 standardHeight; + OSStatus errStatus; + + errStatus = GetThemeMetric( kThemeMetricListHeaderHeight, &standardHeight ); + if (errStatus == noErr) + { + return standardHeight; + } + return -1; } -void -wxRendererMac::DrawTreeItemButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags) + +void wxRendererMac::DrawTreeItemButton( wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags ) { // init the buttons on demand if ( !m_bmpTreeExpanded.Ok() ) @@ -212,72 +256,97 @@ wxRendererMac::DrawTreeItemButton(wxWindow *win, // VZ: this is the old code from treectlg.cpp which apparently doesn't work // but I kept it here just in case it is needed -- if not, please // remove it + #if 0 // def __WXMAC__ - wxMacPortSetter helper(&dc) ; - wxMacWindowClipper clipper(this) ; - wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ; - - int loc_x = x - 5 ; - int loc_y = y_mid - 6 ; - MacWindowToRootWindow( & loc_x , & loc_y ) ; - Rect bounds = { loc_y , loc_x , loc_y + 18 , loc_x + 12 } ; - ThemeButtonDrawInfo info = { kThemeStateActive , item->IsExpanded() ? kThemeDisclosureDown : kThemeDisclosureRight , - kThemeAdornmentNone }; - DrawThemeButton( &bounds, kThemeDisclosureButton , - &info , NULL , NULL , NULL , NULL ) ; + wxMacPortSetter helper(&dc); + wxMacWindowClipper clipper(this); + wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ); + + int loc_x = x - 5; + int loc_y = y_mid - 6; + MacWindowToRootWindow( &loc_x, &loc_y ); + Rect bounds = { loc_y, loc_x, loc_y + 18, loc_x + 12 }; + ThemeButtonDrawInfo info = + { + kThemeStateActive, + item->IsExpanded() ? kThemeDisclosureDown : kThemeDisclosureRight, + kThemeAdornmentNone + }; + + DrawThemeButton( &bounds, kThemeDisclosureButton, &info, NULL, NULL, NULL, NULL ); #else // 1 - dc.DrawBitmap(flags & wxCONTROL_EXPANDED ? m_bmpTreeExpanded - : m_bmpTreeCollapsed, - rect.x, rect.y, true /* use mask */); -#endif // 0/1 + dc.DrawBitmap( + flags & wxCONTROL_EXPANDED + ? m_bmpTreeExpanded + : m_bmpTreeCollapsed, + rect.x, rect.y, true /* use mask */); +#endif } -void -wxRendererMac::DrawSplitterSash(wxWindow *win, - wxDC& dc, - const wxSize& size, - wxCoord position, - wxOrientation orient, - int WXUNUSED(flags)) +void wxRendererMac::DrawSplitterSash( wxWindow *win, + wxDC& dc, + const wxSize& size, + 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 0 - dc.SetPen(*wxLIGHT_GREY_PEN); - dc.SetBrush(*wxWHITE_BRUSH); - if ( orient == wxVERTICAL ) - dc.DrawRectangle(position, 0, 7, size.y); + bool hasMetal = win->MacGetTopLevelWindow()->MacGetMetalAppearance(); + SInt32 height; + GetThemeMetric( kThemeMetricSmallPaneSplitterHeight, &height ); + HIRect splitterRect; + if (orient == wxVERTICAL) + splitterRect = CGRectMake( position, 0, height, size.y ); else - dc.DrawRectangle(0, position, size.x, 7); -#else - // Do the gradient fill: - static int grayValues[] = - { - 0xA0, 0xF6, 0xED, 0xE4, 0xE2, 0xD0, 0xA0 - }; - dc.SetBrush( *wxTRANSPARENT_BRUSH ); - if ( orient == wxVERTICAL ) + 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 ) ) ) { - int i; - for (i=0; i < (int)WXSIZEOF(grayValues); i++) + Rect r = { - dc.SetPen( wxPen( wxColour( grayValues[i] , grayValues[i] , grayValues[i] ), - 1 , wxSOLID ) ); - dc.DrawRectangle( position+i, 0, 1, size.y ); - } + (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 { - 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 ); - } - } + CGContextRef cgContext; + +#if wxMAC_USE_CORE_GRAPHICS + cgContext = ((wxMacCGContext*)(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 -} + HIThemeSplitterDrawInfo drawInfo; + drawInfo.version = 0; + drawInfo.state = kThemeStateActive; + drawInfo.adornment = hasMetal ? kHIThemeSplitterAdornmentMetal : kHIThemeSplitterAdornmentNone; + HIThemeDrawPaneSplitter( &splitterRect, &drawInfo, cgContext, kHIThemeOrientationNormal ); + +#if wxMAC_USE_CORE_GRAPHICS +#else + QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext ); +#endif + } +}