X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1832043f93af07af3f4891d9a95c4d4e1f70eec5..8064223b7b1b3657363b7a635c381b9269d95e55:/src/mac/carbon/renderer.cpp?ds=sidebyside diff --git a/src/mac/carbon/renderer.cpp b/src/mac/carbon/renderer.cpp index 8bc466e488..abcc1d6aa2 100644 --- a/src/mac/carbon/renderer.cpp +++ b/src/mac/carbon/renderer.cpp @@ -26,6 +26,7 @@ #endif #include "wx/renderer.h" +#include "wx/graphics.h" #include "wx/mac/uma.h" @@ -33,10 +34,14 @@ class WXDLLEXPORT wxRendererMac : public wxDelegateRendererNative { public: // draw the header control button (used by wxListCtrl) - virtual void DrawHeaderButton( wxWindow *win, + virtual int DrawHeaderButton( wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0 ); + 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, @@ -52,64 +57,41 @@ public: wxOrientation orient, int flags = 0 ); + virtual void DrawCheckBox(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0); + + virtual void DrawComboBoxDropButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0); + + virtual void DrawPushButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0); + + virtual void DrawItemSelectionRect(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0); + + virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0); + private: + void DrawMacThemeButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags, + int kind, + int adornment); + // the tree buttons wxBitmap m_bmpTreeExpanded; wxBitmap m_bmpTreeCollapsed; }; -// ---------------------------------------------------------------------------- -// Aqua arrows -// ---------------------------------------------------------------------------- - -/* XPM */ -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 -" b ", -" ddb ", -" cccdb ", -" cccccd ", -" ccccccdb ", -" ccccccccd", -" ccccccdb ", -" cccccb ", -" cccdb ", -" ddb ", -" b " -}; - -/* XPM */ -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 -" ", -" ", -" bdcccccccdb ", -" dcccccccd ", -" bcccccccb ", -" dcccccd ", -" bcccccb ", -" bcccd ", -" dcd ", -" bcb ", -" d " -}; - // ============================================================================ // implementation // ============================================================================ @@ -122,98 +104,88 @@ wxRendererNative& wxRendererNative::GetDefault() return s_rendererMac; } -void wxRendererMac::DrawHeaderButton( wxWindow *win, +int wxRendererMac::DrawHeaderButton( wxWindow *win, wxDC& dc, const wxRect& rect, - int flags ) + int flags, + wxHeaderSortIconType sortArrow, + wxHeaderButtonParams* params ) { - 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); + const wxCoord x = rect.x; + const wxCoord y = rect.y; + const wxCoord w = rect.width; + const wxCoord h = rect.height; dc.SetBrush( *wxTRANSPARENT_BRUSH ); -#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 ) ) ) { - HIRect headerRect = CGRectMake( x, y, w, h ); - if ( !dc.IsKindOf( CLASSINFO( wxPaintDC ) ) ) - { - 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; + win->Refresh( &rect ); + } + else + { + CGContextRef cgContext; + wxGCDCImpl *impl = (wxGCDCImpl*) dc.GetImpl(); -#if wxMAC_USE_CORE_GRAPHICS - cgContext = ((wxMacCGContext*)(dc.GetGraphicContext()))->GetNativeContext(); -#else - Rect bounds; + cgContext = (CGContextRef) impl->GetGraphicsContext()->GetNativeContext(); - GetPortBounds( (CGrafPtr) dc.m_macPort, &bounds ); - QDBeginCGContext( (CGrafPtr) dc.m_macPort, &cgContext ); + { + HIThemeButtonDrawInfo drawInfo; + HIRect labelRect; - CGContextTranslateCTM( cgContext, 0, bounds.bottom - bounds.top ); - CGContextScaleCTM( cgContext, 1, -1 ); + 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; - HIShapeReplacePathInCGContext( HIShapeCreateWithQDRgn( (RgnHandle) dc.m_macCurrentClipRgn ), cgContext ); - CGContextClip( cgContext ); - HIViewConvertRect( &headerRect, (HIViewRef) win->GetHandle(), (HIViewRef) win->MacGetTopLevelWindow()->GetHandle() ); -#endif + // 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) ) { - 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; + // 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 -#endif + + // 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) ) { - 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 ); + newRect.width -= 12; + sortArrow = wxHDR_SORT_ICON_NONE; + } + flags &= ~wxCONTROL_SELECTED; + + return 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, @@ -221,43 +193,40 @@ void wxRendererMac::DrawTreeItemButton( wxWindow *win, const wxRect& rect, int flags ) { - // init the buttons on demand - if ( !m_bmpTreeExpanded.Ok() ) + // now the wxGCDC is using native transformations + const wxCoord x = rect.x; + const wxCoord y = rect.y; + const wxCoord w = rect.width; + const wxCoord h = rect.height; + + dc.SetBrush( *wxTRANSPARENT_BRUSH ); + + HIRect headerRect = CGRectMake( x, y, w, h ); + if ( !dc.IsKindOf( CLASSINFO( wxPaintDC ) ) ) { - m_bmpTreeExpanded = wxBitmap(aqua_arrow_down_xpm); - m_bmpTreeCollapsed = wxBitmap(aqua_arrow_right_xpm); + win->Refresh( &rect ); } + else + { + CGContextRef cgContext; - // draw them + wxGCDCImpl *impl = (wxGCDCImpl*) dc.GetImpl(); + cgContext = (CGContextRef) impl->GetGraphicsContext()->GetNativeContext(); - // 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 + HIThemeButtonDrawInfo drawInfo; + HIRect labelRect; -#if 0 // def __WXMAC__ - wxMacPortSetter helper(&dc); - wxMacWindowClipper clipper(this); - wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ); + memset( &drawInfo, 0, sizeof(drawInfo) ); + drawInfo.version = 0; + drawInfo.kind = kThemeDisclosureButton; + drawInfo.state = (flags & wxCONTROL_DISABLED) ? kThemeStateInactive : kThemeStateActive; + // Apple mailing list posts say to use the arrow adornment constants, but those don't work. + // We need to set the value using the 'old' DrawThemeButton constants instead. + drawInfo.value = (flags & wxCONTROL_EXPANDED) ? kThemeDisclosureDown : kThemeDisclosureRight; + drawInfo.adornment = kThemeAdornmentNone; - 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 + HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect ); + } } void wxRendererMac::DrawSplitterSash( wxWindow *win, @@ -267,95 +236,173 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win, wxOrientation orient, int WXUNUSED(flags) ) { -#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 ); + + // 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 ) ) ) { - 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 + wxRect rect( (int) splitterRect.origin.x, (int) splitterRect.origin.y, (int) splitterRect.size.width, + (int) splitterRect.size.height ); + win->Refresh( &rect ); + } + else + { + CGContextRef cgContext; + wxGCDCImpl *impl = (wxGCDCImpl*) dc.GetImpl(); + cgContext = (CGContextRef) impl->GetGraphicsContext()->GetNativeContext(); + + HIThemeSplitterDrawInfo drawInfo; + drawInfo.version = 0; + drawInfo.state = kThemeStateActive; + drawInfo.adornment = hasMetal ? kHIThemeSplitterAdornmentMetal : kHIThemeSplitterAdornmentNone; + HIThemeDrawPaneSplitter( &splitterRect, &drawInfo, cgContext, kHIThemeOrientationNormal ); + } +} - // 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 +void +wxRendererMac::DrawItemSelectionRect(wxWindow * WXUNUSED(win), + wxDC& dc, + const wxRect& rect, + int flags) +{ + if ( !(flags & wxCONTROL_SELECTED) ) + return; - if ( !dc.IsKindOf( CLASSINFO( wxPaintDC ) ) ) - { - 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 = ((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 + wxColour col( wxMacCreateCGColorFromHITheme( (flags & wxCONTROL_FOCUSED) ? + kThemeBrushAlternatePrimaryHighlightColor + : kThemeBrushSecondaryHighlightColor ) ); + wxBrush selBrush( col ); - HIThemeSplitterDrawInfo drawInfo; - drawInfo.version = 0; - drawInfo.state = kThemeStateActive; - drawInfo.adornment = hasMetal ? kHIThemeSplitterAdornmentMetal : kHIThemeSplitterAdornmentNone; - HIThemeDrawPaneSplitter( &splitterRect, &drawInfo, cgContext, kHIThemeOrientationNormal ); + dc.SetPen( *wxTRANSPARENT_PEN ); + dc.SetBrush( selBrush ); + dc.DrawRectangle( rect ); +} -#if wxMAC_USE_CORE_GRAPHICS -#else - QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext ); -#endif - } + +void +wxRendererMac::DrawMacThemeButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags, + int kind, + int adornment) +{ + // now the wxGCDC is using native transformations + const wxCoord x = rect.x; + const wxCoord y = rect.y; + const wxCoord w = rect.width; + const wxCoord h = rect.height; + + dc.SetBrush( *wxTRANSPARENT_BRUSH ); + + HIRect headerRect = CGRectMake( x, y, w, h ); + if ( !dc.IsKindOf( CLASSINFO( wxPaintDC ) ) ) + { + win->Refresh( &rect ); } else -#endif { - // Do the gradient fill: - static int grayValues[] = - { - 0xA0, 0xF6, 0xED, 0xE4, 0xE2, 0xD0, 0xA0 - }; - int i; + wxGCDCImpl *impl = (wxGCDCImpl*) dc.GetImpl(); + CGContextRef cgContext; + cgContext = (CGContextRef) impl->GetGraphicsContext()->GetNativeContext(); - dc.SetBrush( *wxTRANSPARENT_BRUSH ); - if (orient == wxVERTICAL) - { - 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 - { - 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 ); - } - } + HIThemeButtonDrawInfo drawInfo; + HIRect labelRect; + + memset( &drawInfo, 0, sizeof(drawInfo) ); + drawInfo.version = 0; + drawInfo.kind = kind; + drawInfo.state = (flags & wxCONTROL_DISABLED) ? kThemeStateInactive : kThemeStateActive; + drawInfo.value = (flags & wxCONTROL_SELECTED) ? kThemeButtonOn : kThemeButtonOff; + if (flags & wxCONTROL_UNDETERMINED) + drawInfo.value = kThemeButtonMixed; + drawInfo.adornment = adornment; + + HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect ); } } + +void +wxRendererMac::DrawCheckBox(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags) +{ + if (flags & wxCONTROL_CHECKED) + flags |= wxCONTROL_SELECTED; + + DrawMacThemeButton(win, dc, rect, flags, + kThemeCheckBox, kThemeAdornmentNone); +} + +void +wxRendererMac::DrawComboBoxDropButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags) +{ + int kind; + if (win->GetWindowVariant() == wxWINDOW_VARIANT_SMALL || (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL)) + kind = kThemeArrowButtonSmall; + else if (win->GetWindowVariant() == wxWINDOW_VARIANT_MINI || (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_MINI)) + kind = kThemeArrowButtonMini; + else + kind = kThemeArrowButton; + + DrawMacThemeButton(win, dc, rect, flags, + kind, kThemeAdornmentArrowDownArrow); +} + +void +wxRendererMac::DrawPushButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags) +{ + int kind; + if (win->GetWindowVariant() == wxWINDOW_VARIANT_SMALL || (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL)) + kind = kThemeBevelButtonSmall; + // There is no kThemeBevelButtonMini, but in this case, use Small + else if (win->GetWindowVariant() == wxWINDOW_VARIANT_MINI || (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_MINI)) + kind = kThemeBevelButtonSmall; + else + kind = kThemeBevelButton; + + DrawMacThemeButton(win, dc, rect, flags, + kind, kThemeAdornmentNone); +} + +void +wxRendererMac::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) +{ + if (!win) + { + wxDelegateRendererNative::DrawFocusRect(win, dc, rect, flags); + return; + } + + CGRect cgrect = CGRectMake( rect.x , rect.y , rect.width, rect.height ) ; + + HIThemeFrameDrawInfo info ; + memset( &info, 0 , sizeof(info) ) ; + + info.version = 0 ; + info.kind = 0 ; + info.state = kThemeStateActive; + info.isFocused = true ; + + CGContextRef cgContext = (CGContextRef) win->MacGetCGContextRef() ; + wxASSERT( cgContext ) ; + + HIThemeDrawFocusRect( &cgrect , true , cgContext , kHIThemeOrientationNormal ) ; +} +