AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use better face names first in wxGTK wxNativeFontInfo::SetFamily().

Browse Source 
Try better matches and not the most widespread ones first when building a list
of face names to try for the given family. This gives better results when
these better fonts are indeed available and doesn't change anything if they
are not.

See #14126.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2012-05-09 14:24:03 +00:00
parent 912886949a
commit 1b63698581
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/unix/fontutil.cpp
View File

@ -306,25 +306,34 @@ void wxNativeFontInfo::SetFamily(wxFontFamily family)
case wxFONTFAMILY_ROMAN:
// corresponds to the serif font family in the page linked above
facename.Add(wxS("Serif"));
facename.Add(wxS("DejaVu Serif"));
facename.Add(wxS("DejaVu LGC Serif"));
facename.Add(wxS("Bitstream Vera Serif"));
facename.Add(wxS("Liberation Serif"));
facename.Add(wxS("FreeSerif"));
facename.Add(wxS("Luxi Serif"));
facename.Add(wxS("Times New Roman"));
facename.Add(wxS("Century Schoolbook L"));
facename.Add(wxS("URW Bookman L"));
facename.Add(wxS("URW Palladio L"));
facename.Add(wxS("DejaVu Serif"));
facename.Add(wxS("FreeSerif"));
facename.Add(wxS("Times New Roman"));
facename.Add(wxS("Times"));
break;
case wxFONTFAMILY_TELETYPE:
case wxFONTFAMILY_MODERN:
// corresponds to the monospace font family in the page linked above
facename.Add(wxS("Monospace"));
facename.Add(wxS("DejaVu Sans Mono"));
facename.Add(wxS("Nimbus Mono L"));
facename.Add(wxS("DejaVu LGC Sans Mono"));
facename.Add(wxS("Bitstream Vera Sans Mono"));
facename.Add(wxS("Andale Mono"));
facename.Add(wxS("Lucida Sans Typewriter"));
facename.Add(wxS("Liberation Mono"));
facename.Add(wxS("FreeMono"));
facename.Add(wxS("Luxi Mono"));
facename.Add(wxS("Courier New"));
facename.Add(wxS("Lucida Sans Typewriter"));
facename.Add(wxS("Nimbus Mono L"));
facename.Add(wxS("Andale Mono"));
facename.Add(wxS("Courier"));
break;
@ -332,13 +341,17 @@ void wxNativeFontInfo::SetFamily(wxFontFamily family)
case wxFONTFAMILY_DEFAULT:
default:
// corresponds to the sans-serif font family in the page linked above
facename.Add(wxS("Sans"));
facename.Add(wxS("DejaVu Sans"));
facename.Add(wxS("URW Gothic L"));
facename.Add(wxS("Nimbus Sans L"));
facename.Add(wxS("DejaVu LGC Sans"));
facename.Add(wxS("Bitstream Vera Sans"));
facename.Add(wxS("Lucida Sans"));
facename.Add(wxS("Arial"));
facename.Add(wxS("Liberation Sans"));
facename.Add(wxS("FreeSans"));
facename.Add(wxS("Luxi Sans"));
facename.Add(wxS("Arial"));
facename.Add(wxS("Lucida Sans"));
facename.Add(wxS("Nimbus Sans L"));
facename.Add(wxS("URW Gothic L"));
break;
}