suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix drawing of multi-character strings with font substitution and rotation

Browse Source 
svn: r4616
This commit is contained in:
Matthew Flatt 2006-10-17 03:03:22 +00:00
parent 3a8cfed33b
commit 5145ea908c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wxxt/src/DeviceContexts/WindowDC.cc
View File

@ -2377,16 +2377,17 @@ void wxWindowDC::DrawText(char *orig_text, double x, double y,
while (1) { while (1) {
cval = text[dt]; cval = text[dt];
if (!XftGlyphExists(DPY, this_time, cval)) { if (!XftGlyphExists(DPY, this_time, cval)) {
this_time = (wxFontStruct*)current_font->GetNextAASubstitution(index++, cval, scale_x, scale_y, angle); this_time = (wxFontStruct*)current_font->GetNextAASubstitution(index, cval, scale_x, scale_y, angle);
if (!this_time) { if (!this_time) {
this_time = xfontinfo; this_time = xfontinfo;
this_time_no_rotate = no_rotate; this_time_no_rotate = no_rotate;
break; break;
} }
if (angle != 0.0) if (angle != 0.0)
this_time_no_rotate = (wxFontStruct*)current_font->GetNextAASubstitution(index++, cval, e_scale_x, e_scale_y, 0.0); this_time_no_rotate = (wxFontStruct*)current_font->GetNextAASubstitution(index, cval, e_scale_x, e_scale_y, 0.0);
else else
this_time_no_rotate = this_time; this_time_no_rotate = this_time;
index++;
} else } else
break; break;
} }