Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing header button to properly use native themed arrows

Browse Source
This commit is contained in:
Stefan Csomor
2017-06-01 11:30:59 +02:00
parent e8333ebe71
commit ad96f4be55
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/osx/carbon/renderer.cpp
View File

@@ -198,34 +198,35 @@ int wxRendererMac::DrawHeaderButton( wxWindow *win,
memset( &drawInfo, 0, sizeof(drawInfo) ); memset( &drawInfo, 0, sizeof(drawInfo) );
drawInfo.version = 0; drawInfo.version = 0;
drawInfo.kind = kThemeListHeaderButton; drawInfo.kind = kThemeListHeaderButton;
drawInfo.state = (flags & wxCONTROL_DISABLED) ? kThemeStateInactive : kThemeStateActive;
drawInfo.value = (flags & wxCONTROL_PRESSED) ? kThemeButtonOn : kThemeButtonOff;
drawInfo.adornment = kThemeAdornmentNone; drawInfo.adornment = kThemeAdornmentNone;
drawInfo.value = kThemeButtonOff;
if ( flags & wxCONTROL_DISABLED )
drawInfo.state = kThemeStateInactive;
else if ( flags & wxCONTROL_PRESSED )
drawInfo.state = kThemeStatePressed;
else
drawInfo.state = kThemeStateActive;
// The down arrow is drawn automatically, change it to an up arrow if needed. // The down arrow is drawn automatically (if value is kThemeButtonOn)
// change it to an up arrow if needed.
if ( sortArrow == wxHDR_SORT_ICON_UP ) if ( sortArrow == wxHDR_SORT_ICON_UP )
{
drawInfo.adornment = kThemeAdornmentHeaderButtonSortUp; drawInfo.adornment = kThemeAdornmentHeaderButtonSortUp;
drawInfo.value = kThemeButtonOn;
}
else if (sortArrow == wxHDR_SORT_ICON_DOWN )
{
drawInfo.value = kThemeButtonOn;
}
HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect ); 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_PRESSED) && (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 );
}
} }
} }
// Reserve room for the arrows before writing the label, and turn off the // Reserve room for the arrows before writing the label, and turn off the
// flags we've already handled // flags we've already handled
wxRect newRect(rect); wxRect newRect(rect);
if ( (flags & wxCONTROL_PRESSED) && (sortArrow != wxHDR_SORT_ICON_NONE) ) if ( sortArrow != wxHDR_SORT_ICON_NONE )
{ {
newRect.width -= 12; newRect.width -= 12;
sortArrow = wxHDR_SORT_ICON_NONE; sortArrow = wxHDR_SORT_ICON_NONE;