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

Select a sans serif font for wxQt by default

Browse Source 
Using QFont::AnyStyle could result in some completely inappropriate font
being chosen, try using QFont::SansSerif style hint to select a better
font by default.

Closes #18237.
This commit is contained in:
Vadim Zeitlin
2019-04-19 00:10:57 +02:00
parent 1f15b41f55
commit 18afc4d3c1
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/qt/settings.cpp
View File

@@ -144,9 +144,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
case wxSYS_OEM_FIXED_FONT:
case wxSYS_ANSI_FIXED_FONT:
case wxSYS_SYSTEM_FIXED_FONT:
// let Qt font matching algorithm to select the font
font.SetFamily(wxFONTFAMILY_TELETYPE);
font.SetFaceName("monospace");
break;
case wxSYS_ANSI_VAR_FONT:
@@ -154,9 +152,8 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
case wxSYS_DEVICE_DEFAULT_FONT:
case wxSYS_DEFAULT_GUI_FONT:
default:
// let Qt font matching algorithm to select the font
font.SetFamily(wxFONTFAMILY_DEFAULT);
font.SetFaceName("");
// Let Qt select any sans serif font.
font.SetFamily(wxFONTFAMILY_SWISS);
break;
}