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

applied Derry's patch to fix scaling bug

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-01-11 16:26:24 +00:00
parent a4352768d7
commit 6c49baf214
1 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/unix/fontutil.cpp
View File

@@ -110,8 +110,8 @@ static wxNativeFont wxLoadQueryFont(int pointSize,
// encodingid;registry;encoding[;facename] // encodingid;registry;encoding[;facename]
bool wxNativeEncodingInfo::FromString(const wxString& s) bool wxNativeEncodingInfo::FromString(const wxString& s)
{ {
// use ";", not "-" because it may be part of encoding name
wxStringTokenizer tokenizer(s, _T(";")); wxStringTokenizer tokenizer(s, _T(";"));
// cannot use "-" because it may be part of encoding name
wxString encid = tokenizer.GetNextToken(); wxString encid = tokenizer.GetNextToken();
long enc; long enc;
@@ -274,13 +274,34 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
} }
} }
} }
// OK, we have the correct xregistry/xencoding in info structure // OK, we have the correct xregistry/xencoding in info structure
wxNativeFont font = 0; wxNativeFont font = 0;
// if we already have the X font name, try to use it // if we already have the X font name, try to use it
if( xFontName && !xFontName->IsEmpty() ) if( xFontName && !xFontName->IsEmpty() )
font = wxLoadFont(*xFontName); {
//
// Make sure point size is correct for scale factor.
//
wxStringTokenizer tokenizer(*xFontName, _T("-"), wxTOKEN_RET_DELIMS);
wxString newFontName;
for(int i = 0; i < 8; i++)
newFontName += tokenizer.NextToken();
(void) tokenizer.NextToken();
newFontName += wxString::Format("%d-", pointSize);
while(tokenizer.HasMoreTokens())
newFontName += tokenizer.GetNextToken();
font = wxLoadFont(newFontName);
if(font)
*xFontName = newFontName;
}
if( !font ) if( !font )
font = wxLoadQueryFont( pointSize, family, style, weight, font = wxLoadQueryFont( pointSize, family, style, weight,
@@ -360,13 +381,12 @@ static bool wxTestFontSpec(const wxString& fontspec)
wxNativeFont test = (wxNativeFont) g_fontHash->Get( fontspec ); wxNativeFont test = (wxNativeFont) g_fontHash->Get( fontspec );
if (test) if (test)
{ {
// printf( "speed up\n" );
return TRUE; return TRUE;
} }
test = wxLoadFont(fontspec); test = wxLoadFont(fontspec);
g_fontHash->Put( fontspec, (wxObject*) test ); g_fontHash->Put( fontspec, (wxObject*) test );
if ( test ) if ( test )
{ {
wxFreeFont(test); wxFreeFont(test);