X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be01a40397e2cadfa1f2bc047e5f52c7123825f5..3e1924dd5f5744c3e2a8973de9b3e4f372b7fd85:/src/mac/carbon/renderer.cpp diff --git a/src/mac/carbon/renderer.cpp b/src/mac/carbon/renderer.cpp index b44cd2cd78..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,7 +34,7 @@ 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, @@ -41,7 +42,7 @@ public: 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, @@ -56,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 // ============================================================================ @@ -126,54 +104,31 @@ wxRendererNative& wxRendererNative::GetDefault() return s_rendererMac; } -void wxRendererMac::DrawHeaderButton( wxWindow *win, +int wxRendererMac::DrawHeaderButton( wxWindow *win, wxDC& dc, const wxRect& rect, int flags, wxHeaderSortIconType sortArrow, wxHeaderButtonParams* params ) { - const wxCoord x = dc.LogicalToDeviceX(rect.x /*- 1*/); - const wxCoord y = dc.LogicalToDeviceY(rect.y /*- 1*/); - const wxCoord w = dc.LogicalToDeviceXRel(rect.width); - const wxCoord h = dc.LogicalToDeviceYRel(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 ); 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 ); + win->Refresh( &rect ); } else { CGContextRef cgContext; + wxGCDCImpl *impl = (wxGCDCImpl*) dc.GetImpl(); -#if wxMAC_USE_CORE_GRAPHICS - cgContext = (CGContextRef) dc.GetGraphicsContext()->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 + cgContext = (CGContextRef) impl->GetGraphicsContext()->GetNativeContext(); { HIThemeButtonDrawInfo drawInfo; @@ -189,7 +144,7 @@ void wxRendererMac::DrawHeaderButton( wxWindow *win, // 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 @@ -202,13 +157,8 @@ void wxRendererMac::DrawHeaderButton( wxWindow *win, 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 } // Reserve room for the arrows before writing the label, and turn off the @@ -221,14 +171,14 @@ void wxRendererMac::DrawHeaderButton( wxWindow *win, } flags &= ~wxCONTROL_SELECTED; - DrawHeaderButtonContents(win, dc, newRect, flags, sortArrow, params); + return DrawHeaderButtonContents(win, dc, newRect, flags, sortArrow, params); } int wxRendererMac::GetHeaderButtonHeight(wxWindow* WXUNUSED(win)) { - SInt32 standardHeight; - OSStatus errStatus; + SInt32 standardHeight; + OSStatus errStatus; errStatus = GetThemeMetric( kThemeMetricListHeaderHeight, &standardHeight ); if (errStatus == noErr) @@ -238,49 +188,45 @@ int wxRendererMac::GetHeaderButtonHeight(wxWindow* WXUNUSED(win)) return -1; } - void wxRendererMac::DrawTreeItemButton( wxWindow *win, wxDC& dc, 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 - - // 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 + wxGCDCImpl *impl = (wxGCDCImpl*) dc.GetImpl(); + cgContext = (CGContextRef) impl->GetGraphicsContext()->GetNativeContext(); -#if 0 // def __WXMAC__ - wxMacPortSetter helper(&dc); - wxMacWindowClipper clipper(this); - wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ); + HIThemeButtonDrawInfo drawInfo; + HIRect labelRect; - 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 + 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; + + HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect ); + } } void wxRendererMac::DrawSplitterSash( wxWindow *win, @@ -299,54 +245,164 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win, 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 ) ) ) { - 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 ); - } + wxRect rect( (int) splitterRect.origin.x, (int) splitterRect.origin.y, (int) splitterRect.size.width, + (int) splitterRect.size.height ); + win->Refresh( &rect ); + } else { CGContextRef cgContext; - -#if wxMAC_USE_CORE_GRAPHICS - cgContext = (CGContextRef) dc.GetGraphicsContext()->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 + 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 ); + } +} -#if wxMAC_USE_CORE_GRAPHICS -#else - QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext ); -#endif +void +wxRendererMac::DrawItemSelectionRect(wxWindow * WXUNUSED(win), + wxDC& dc, + const wxRect& rect, + int flags) +{ + if ( !(flags & wxCONTROL_SELECTED) ) + return; + + wxColour col( wxMacCreateCGColorFromHITheme( (flags & wxCONTROL_FOCUSED) ? + kThemeBrushAlternatePrimaryHighlightColor + : kThemeBrushSecondaryHighlightColor ) ); + wxBrush selBrush( col ); + + dc.SetPen( *wxTRANSPARENT_PEN ); + dc.SetBrush( selBrush ); + dc.DrawRectangle( rect ); +} + + +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 + { + wxGCDCImpl *impl = (wxGCDCImpl*) dc.GetImpl(); + CGContextRef cgContext; + cgContext = (CGContextRef) impl->GetGraphicsContext()->GetNativeContext(); + + 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 ) ; +} +