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

fixing proper font rendering color when using emulated bold

Browse Source 
when the stroke width is set in macOS (emulated bold), the stroke color was not correctly set - unless text color was black
This commit is contained in:
Stefan Csomor
2018-10-22 17:43:31 +02:00
parent a69a43bc53
commit 7dfbe50fc0
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/osx/core/cfdictionary.h
View File

@@ -90,6 +90,11 @@ public:
{ {
return CFDictionaryCreateCopy(kCFAllocatorDefault, this->m_ptr); return CFDictionaryCreateCopy(kCFAllocatorDefault, this->m_ptr);
} }
CFMutableDictionaryRef CreateMutableCopy() const
{
return CFDictionaryCreateMutableCopy(kCFAllocatorDefault, 0, this->m_ptr);
}
}; };
class wxCFMutableDictionaryRef : public wxCFDictionaryRefCommon<CFMutableDictionaryRef> class wxCFMutableDictionaryRef : public wxCFDictionaryRefCommon<CFMutableDictionaryRef>

19
src/osx/carbon/graphics.cpp
View File

@@ -39,6 +39,7 @@
#include "wx/osx/dcclient.h" #include "wx/osx/dcclient.h"
#include "wx/osx/dcmemory.h" #include "wx/osx/dcmemory.h"
#include "wx/osx/private.h" #include "wx/osx/private.h"
#include "wx/osx/core/cfdictionary.h"
#else #else
#include "CoreServices/CoreServices.h" #include "CoreServices/CoreServices.h"
#include "ApplicationServices/ApplicationServices.h" #include "ApplicationServices/ApplicationServices.h"
@@ -2298,7 +2299,23 @@ void wxMacCoreGraphicsContext::DoDrawText( const wxString &str, wxDouble x, wxDo
CGColorRef col = wxMacCreateCGColor( fref->GetColour() ); CGColorRef col = wxMacCreateCGColor( fref->GetColour() );
CTFontRef font = fref->OSXGetCTFont(); CTFontRef font = fref->OSXGetCTFont();
wxCFRef<CFAttributedStringRef> attrtext( CFAttributedStringCreate(kCFAllocatorDefault, text, fref->OSXGetCTFontAttributes()) ); wxCFDictionaryRef fontattr(wxCFRetain(fref->OSXGetCTFontAttributes()));
wxCFMutableDictionaryRef inlinefontattr;
bool setColorsInLine = false;
// if we emulate boldness the stroke color is not taken from the current context
// therefore we have to set it explicitly
if ( fontattr.GetValue(kCTStrokeWidthAttributeName) != NULL)
{
setColorsInLine = true;
inlinefontattr = fontattr.CreateMutableCopy();
inlinefontattr.SetValue(kCTForegroundColorFromContextAttributeName, kCFBooleanFalse);
inlinefontattr.SetValue(kCTForegroundColorAttributeName,col);
inlinefontattr.SetValue(kCTStrokeColorAttributeName,col);
}
wxCFRef<CFAttributedStringRef> attrtext( CFAttributedStringCreate(kCFAllocatorDefault, text, setColorsInLine ? inlinefontattr : fontattr ) );
wxCFRef<CTLineRef> line( CTLineCreateWithAttributedString(attrtext) ); wxCFRef<CTLineRef> line( CTLineCreateWithAttributedString(attrtext) );
y += CTFontGetAscent(font); y += CTFontGetAscent(font);