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

OSX use fontAttributes for better emulation of bold fonts (#501)

Browse Source 
* using fontAttributes dictionary allows for better emulation of bold typefaces, also switch to using color from context, this allows keeping the same dict throughout, as a side effect fix font caching

* reverting in order to maintain crossplatform compatibility

* applying review suggestions

* applying review suggestions
This commit is contained in:
Stefan Csomor
2017-06-20 17:55:26 +02:00
committed by GitHub
parent e121e8addb
commit 8b1381f2b1
4 changed files with 70 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/osx/carbon/font.cpp
View File

@@ -158,6 +158,7 @@ protected:
public:
bool m_fontValid;
wxCFRef<CTFontRef> m_ctFont;
wxCFRef<CFDictionaryRef> m_ctFontAttributes;
wxCFRef<CGFontRef> m_cgFont;
#if wxOSX_USE_COCOA
WX_NSFont m_nsFont;
@@ -176,6 +177,7 @@ wxFontRefData::wxFontRefData(const wxFontRefData& data) : wxGDIRefData()
m_info = data.m_info;
m_fontValid = data.m_fontValid;
m_ctFont = data.m_ctFont;
m_ctFontAttributes = data.m_ctFontAttributes;
m_cgFont = data.m_cgFont;
#if wxOSX_USE_COCOA
m_nsFont = (NSFont*) wxMacCocoaRetain(data.m_nsFont);
@@ -271,6 +273,11 @@ wxFontRefData::wxFontRefData(wxOSXSystemFont font, int size)
break;
}
m_ctFont.reset(CTFontCreateUIFontForLanguage( uifont, (CGFloat) size, NULL ));
CFMutableDictionaryRef dict = CFDictionaryCreateMutable(kCFAllocatorDefault, 0,&kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
m_ctFontAttributes.reset(dict);
CFDictionarySetValue(dict, kCTFontAttributeName, m_ctFont.get() );
CFDictionarySetValue(dict, kCTForegroundColorFromContextAttributeName, kCFBooleanTrue);
wxCFRef<CTFontDescriptorRef> descr;
descr.reset( CTFontCopyFontDescriptor( m_ctFont ) );
m_info.Init(descr);
@@ -288,6 +295,16 @@ wxFontRefData::wxFontRefData(wxOSXSystemFont font, int size)
static const CGAffineTransform kSlantTransform = CGAffineTransformMake( 1, 0, tan(wxDegToRad(11)), 1, 0, 0 );
namespace
{
struct CachedFontEntry {
wxCFRef< CTFontRef > font;
wxCFRef< CFDictionaryRef > fontAttributes;
} ;
} // anonymous namespace
void wxFontRefData::MacFindFont()
{
if ( m_fontValid )
@@ -306,10 +323,19 @@ void wxFontRefData::MacFindFont()
// use font caching
wxString lookupnameWithSize = wxString::Format( "%s_%u_%d", m_info.m_faceName, traits, m_info.m_pointSize );
static std::map< std::wstring , wxCFRef< CTFontRef > > fontcache ;
m_ctFont = fontcache[ std::wstring(lookupnameWithSize.wc_str()) ];
if ( !m_ctFont )
static std::map< wxString, CachedFontEntry > fontcache ;
CachedFontEntry& entry = fontcache[ lookupnameWithSize ];
m_ctFont = entry.font;
m_ctFontAttributes = entry.fontAttributes;
if ( m_ctFont )
{
// use cached version
}
else
{
CFMutableDictionaryRef dict = CFDictionaryCreateMutable(kCFAllocatorDefault, 0,&kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
m_ctFontAttributes.reset(dict);
wxStringToStringHashMap::const_iterator it = gs_FontFamilyToPSName.find(m_info.m_faceName);
@@ -350,11 +376,23 @@ void wxFontRefData::MacFindFont()
fontWithTraits = CTFontCreateCopyWithSymbolicTraits( m_ctFont, 0, remainingTransform, remainingTraits, remainingTraits );
if ( fontWithTraits == NULL )
{
// give in on the bold, try native oblique
// try native oblique, emulate bold later
fontWithTraits = CTFontCreateCopyWithSymbolicTraits( m_ctFont, 0, NULL, kCTFontItalicTrait, kCTFontItalicTrait );
}
else
{
remainingTraits &= ~kCTFontBoldTrait;
}
}
}
// we have to emulate bold
if ( remainingTraits & kCTFontBoldTrait )
{
// 3 times as thick, negative value because we want effect on stroke and fill (not only stroke)
const float strokewidth = -3.0;
CFDictionarySetValue(dict, kCTStrokeWidthAttributeName, CFNumberCreate( NULL, kCFNumberFloatType, &strokewidth));
}
if ( fontWithTraits == NULL )
{
@@ -366,6 +404,11 @@ void wxFontRefData::MacFindFont()
m_ctFont.reset(fontWithTraits);
}
}
CFDictionarySetValue(dict, kCTFontAttributeName, m_ctFont.get() );
CFDictionarySetValue(dict, kCTForegroundColorFromContextAttributeName, kCFBooleanTrue);
entry.font = m_ctFont;
entry.fontAttributes = m_ctFontAttributes;
}
m_cgFont.reset(CTFontCopyGraphicsFont(m_ctFont, NULL));
@@ -378,7 +421,7 @@ void wxFontRefData::MacFindFont()
#endif
m_fontValid = true;
}
bool wxFontRefData::IsFixedWidth() const
{
CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(m_ctFont);
@@ -659,6 +702,16 @@ CTFontRef wxFont::OSXGetCTFont() const
return (CTFontRef)(M_FONTDATA->m_ctFont);
}
CFDictionaryRef wxFont::OSXGetCTFontAttributes() const
{
wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
// cast away constness otherwise lazy font resolution is not possible
const_cast<wxFont *>(this)->RealizeResource();
return (CFDictionaryRef)(M_FONTDATA->m_ctFontAttributes);
}
#if wxOSX_USE_COCOA_OR_CARBON
CGFontRef wxFont::OSXGetCGFont() const