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

Add wxNativeFontInfo::GetPointSizeFromLogFontHeight() helper

Browse Source 
No real changes, just refactor the code previously present in both
wxNativeFontInfo ctor and SetPixelSize() in a single function and reuse
it in both places.
This commit is contained in:
Vadim Zeitlin
2019-07-16 14:33:36 +02:00
parent 8ab9fed14e
commit 5507f8eebc
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/fontutil.h
View File

@@ -118,7 +118,14 @@ public:
// set the XFLD // set the XFLD
void SetXFontName(const wxString& xFontName); void SetXFontName(const wxString& xFontName);
#elif defined(__WXMSW__) #elif defined(__WXMSW__)
wxNativeFontInfo(const LOGFONT& lf_); wxNativeFontInfo(const LOGFONT& lf_)
: lf(lf_),
pointSize(GetPointSizeFromLogFontHeight(lf.lfHeight))
{
}
// MSW-specific: get point size from LOGFONT height using the default DPI.
static float GetPointSizeFromLogFontHeight(int height);
// MSW-specific: get the height value in pixels using LOGFONT convention // MSW-specific: get the height value in pixels using LOGFONT convention
// (i.e. negative) corresponding to the given size in points and DPI. // (i.e. negative) corresponding to the given size in points and DPI.

9
src/msw/font.cpp
View File

@@ -402,13 +402,13 @@ void wxFontRefData::Free()
// wxNativeFontInfo // wxNativeFontInfo
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxNativeFontInfo::wxNativeFontInfo(const LOGFONT& lf_) /* static */
: lf(lf_) float wxNativeFontInfo::GetPointSizeFromLogFontHeight(int height)
{ {
// Determine the size in points using the primary screen DPI as we don't // Determine the size in points using the primary screen DPI as we don't
// have anything else here. // have anything else here.
const float ppi = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY); const float ppi = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
pointSize = 72.0f * abs(lf.lfHeight) / ppi; return 72.0f * abs(height) / ppi;
} }
void wxNativeFontInfo::Init() void wxNativeFontInfo::Init()
@@ -535,8 +535,7 @@ void wxNativeFontInfo::SetPixelSize(const wxSize& pixelSize)
// We don't have the right DPI to use here neither, but we need to update // We don't have the right DPI to use here neither, but we need to update
// the point size too, so fall back to the default. // the point size too, so fall back to the default.
const float ppi = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY); pointSize = GetPointSizeFromLogFontHeight(lf.lfHeight);
pointSize = 72.0f * pixelSize.GetHeight() / ppi;
} }
void wxNativeFontInfo::SetStyle(wxFontStyle style) void wxNativeFontInfo::SetStyle(wxFontStyle style)