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

Restructure Cairo font initialization

Browse Source 
Add some comments explaining why things are done.
This commit is contained in:
Maarten Bent
2022-04-24 18:40:02 +02:00
parent bf4e45fc67
commit 77a61569a8
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/generic/graphicc.cpp
View File

@@ -1138,19 +1138,24 @@ wxCairoFontData::wxCairoFontData( wxGraphicsRenderer* renderer, const wxFont &fo
{ {
InitColour(col); InitColour(col);
#ifndef __WXMAC__ #ifdef __WXMSW__
// Font is 72 DPI, screen is 96-based, and font needs a correction
// for screens with higher DPI (similar to gdi+ and d2d renderers).
m_size = !dpi.y m_size = !dpi.y
? double(font.GetPixelSize().GetHeight()) ? double(font.GetPixelSize().GetHeight())
: double(font.GetFractionalPointSize() * dpi.y / 72); : (font.GetFractionalPointSize() * dpi.y / 72);
#else #else
// On macOS, font and screen both are 72 DPI, and macOS font size does
// not need a correction for retina displays.
// GTK does not use m_size, but initialize it anyway and mark dpi as unused
// so we don't get any compiler warnings.
wxUnusedVar(dpi); wxUnusedVar(dpi);
m_size = font.GetPointSize(); m_size = font.GetFractionalPointSize() * wxDisplay::GetStdPPIValue() / 72;
#endif
#ifdef __WXMAC__ #ifdef __WXMAC__
m_font = cairo_quartz_font_face_create_for_cgfont(font.OSXGetCGFont()); m_font = cairo_quartz_font_face_create_for_cgfont(font.OSXGetCGFont());
#elif defined(__WXGTK__) #endif
#else #endif
InitFontComponents InitFontComponents
( (
font.GetFaceName(), font.GetFaceName(),
@@ -1159,7 +1164,6 @@ wxCairoFontData::wxCairoFontData( wxGraphicsRenderer* renderer, const wxFont &fo
font.GetWeight() == wxFONTWEIGHT_BOLD ? CAIRO_FONT_WEIGHT_BOLD font.GetWeight() == wxFONTWEIGHT_BOLD ? CAIRO_FONT_WEIGHT_BOLD
: CAIRO_FONT_WEIGHT_NORMAL : CAIRO_FONT_WEIGHT_NORMAL
); );
#endif
} }
wxCairoFontData::wxCairoFontData(wxGraphicsRenderer* renderer, wxCairoFontData::wxCairoFontData(wxGraphicsRenderer* renderer,