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

Use fractional point sizes in SetWindowVariant()

Browse Source 
Don't round the scaled font size now that we can just directly use the
fractional value.
This commit is contained in:
Vadim Zeitlin
2018-09-15 12:41:43 +02:00
parent cd24db056e
commit ac8b2e10a9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/wincmn.cpp
View File

@@ -1020,22 +1020,22 @@ void wxWindowBase::DoSetWindowVariant( wxWindowVariant variant )
// adjust the font height to correspond to our new variant (notice that
// we're only called if something really changed)
wxFont font = GetFont();
int size = font.GetPointSize();
float size = font.GetFractionalPointSize();
switch ( variant )
{
case wxWINDOW_VARIANT_NORMAL:
break;
case wxWINDOW_VARIANT_SMALL:
size = wxRound(size / 1.2);
size /= 1.2f;
break;
case wxWINDOW_VARIANT_MINI:
size = wxRound(size / (1.2 * 1.2));
size /= 1.2f * 1.2f;
break;
case wxWINDOW_VARIANT_LARGE:
size = wxRound(size * 1.2);
size *= 1.2f;
break;
default:
@@ -1043,7 +1043,7 @@ void wxWindowBase::DoSetWindowVariant( wxWindowVariant variant )
break;
}
font.SetPointSize(size);
font.SetFractionalPointSize(size);
SetFont(font);
}