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

Support underlined/strikethrough fonts for window labels in wxOSX

Browse Source 
Use setAttributedTitle: to take into account font underline/strikethrough
attributes when using it for the window label.

See https://github.com/wxWidgets/wxWidgets/pull/187
This commit is contained in:
Daniel Kulp
2016-02-22 23:17:47 +01:00
committed by Vadim Zeitlin
parent 54a64fc549
commit cb3ac0e6fc
1 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/osx/cocoa/window.mm
View File

@@ -2420,6 +2420,46 @@ bool wxWidgetCocoaImpl::SetBackgroundStyle( wxBackgroundStyle style )
void wxWidgetCocoaImpl::SetLabel( const wxString& title, wxFontEncoding encoding )
{
if ( [m_osxView respondsToSelector:@selector(setAttributedTitle:) ] )
{
wxFont f = GetWXPeer()->GetFont();
if ( f.GetStrikethrough() || f.GetUnderlined() )
{
wxCFStringRef cf(title, encoding );
NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc]
initWithString:cf.AsNSString()];
[attrString beginEditing];
[attrString setAlignment:NSCenterTextAlignment
range:NSMakeRange(0, [attrString length])];
[attrString addAttribute:NSFontAttributeName
value:f.OSXGetNSFont()
range:NSMakeRange(0, [attrString length])];
if ( f.GetStrikethrough() )
{
[attrString addAttribute:NSStrikethroughStyleAttributeName
value:@(NSUnderlineStyleSingle)
range:NSMakeRange(0, [attrString length])];
}
if ( f.GetUnderlined() )
{
[attrString addAttribute:NSUnderlineStyleAttributeName
value:@(NSUnderlineStyleSingle)
range:NSMakeRange(0, [attrString length])];
}
[attrString endEditing];
[(id)m_osxView setAttributedTitle:attrString];
return;
}
}
if ( [m_osxView respondsToSelector:@selector(setTitle:) ] )
{
wxCFStringRef cf( title , encoding );