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

Fix font height handling in MSW wxNativeFontInfo::FromString()

Browse Source 
This is similar to 228cd926e2, but extends
the fix to v1 strings, as even though they have the "point size" field,
this field may still contain 0, resulting in the same problem as with v0
strings, i.e. 0-sized fonts.

Closes #18467.
This commit is contained in:
Vadim Zeitlin 2019-08-21 14:21:11 +02:00
parent 05402e9eac
commit b686d77aaf
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/msw/font.cpp
View File

@ -658,13 +658,15 @@ bool wxNativeFontInfo::FromString(const wxString& s)
if ( !token.ToLong(&l) )
return false;
bool setPointSizeFromHeight = false;
// If fractional point size is not present (which can happen if we have a
// string in version 0 or even with version 1 if it doesn't contain a valid
// point size), ensure that we set it from lfHeight below.
bool setPointSizeFromHeight = true;
switch ( l )
{
case 0:
// Fractional point size is not present in this version, it will be
// set from lfHeight below in this case.
setPointSizeFromHeight = true;
// Fractional point size is not present in this version, so nothing
// special to do.
break;
case 1:
@ -672,9 +674,17 @@ bool wxNativeFontInfo::FromString(const wxString& s)
double d;
if ( !tokenizer.GetNextToken().ToCDouble(&d) )
return false;
pointSize = static_cast<float>(d);
if ( static_cast<double>(pointSize) != d )
return false;
// If the size is present but 0, ignore it and still use
// lfHeight, as with v0 strings.
if ( !wxIsNullDouble(d) )
{
pointSize = static_cast<float>(d);
if ( static_cast<double>(pointSize) != d )
return false;
setPointSizeFromHeight = false;
}
}
break;