#include "wx/bitmap.h"
#include "wx/settings.h"
#include "wx/dcclient.h"
+ #include "wx/toplevel.h"
#endif
#include "wx/renderer.h"
-#include "wx/toplevel.h"
#include "wx/mac/uma.h"
virtual void 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,
wxDC& dc,
void 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 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 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
+ Rect r =
{
- CGContextRef cgContext;
+ (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 = ((wxMacCGContext*)(dc.GetGraphicContext()))->GetNativeContext();
+ cgContext = ((wxMacCGContext*)(dc.GetGraphicContext()))->GetNativeContext();
#else
- Rect bounds;
+ Rect bounds;
- GetPortBounds( (CGrafPtr) dc.m_macPort, &bounds );
- QDBeginCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
+ GetPortBounds( (CGrafPtr) dc.m_macPort, &bounds );
+ QDBeginCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
- CGContextTranslateCTM( cgContext, 0, bounds.bottom - bounds.top );
- CGContextScaleCTM( cgContext, 1, -1 );
+ 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() );
+ HIShapeReplacePathInCGContext( HIShapeCreateWithQDRgn( (RgnHandle) dc.m_macCurrentClipRgn ), cgContext );
+ CGContextClip( cgContext );
+ HIViewConvertRect( &headerRect, (HIViewRef) win->GetHandle(), (HIViewRef) win->MacGetTopLevelWindow()->GetHandle() );
#endif
+ {
+ 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) )
{
- 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 );
+ 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) )
+ {
+ 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)
{
- 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 );
+ return standardHeight;
}
+ return -1;
}
+
void wxRendererMac::DrawTreeItemButton( wxWindow *win,
wxDC& dc,
const wxRect& rect,
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 );
+ 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() );
+ 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
+ // 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 );
- }
- else
+ if ( !dc.IsKindOf( CLASSINFO( wxPaintDC ) ) )
+ {
+ Rect r =
{
- CGContextRef cgContext;
+ (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();
+ 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 );
+ 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 );
+ 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 );
+ QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
#endif
- }
- }
- else
-#endif
- {
- // Do the gradient fill:
- static int grayValues[] =
- {
- 0xA0, 0xF6, 0xED, 0xE4, 0xE2, 0xD0, 0xA0
- };
- int i;
-
- 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 );
- }
- }
}
}
projects / wxWidgets.git / blobdiff