fixed spacing bug when drawing partly-smoothed text at non-1.0 scale

svn: r567
This commit is contained in:
Matthew Flatt 2005-08-08 19:49:21 +00:00
parent 6418b30860
commit a2eaedecdc

View File

@ -167,6 +167,7 @@ void wxCanvasDC::DrawText(const char* text, double x, double y, Bool combine, Bo
wxKey *k = (wxKey *)SCHEME_BYTE_STR_VAL(table_key); wxKey *k = (wxKey *)SCHEME_BYTE_STR_VAL(table_key);
int ulen; int ulen;
atomic_timeout_t old; atomic_timeout_t old;
double one_res;
CGSize *sizes; CGSize *sizes;
CGGlyph *cgglyphs; CGGlyph *cgglyphs;
int glyph; int glyph;
@ -211,7 +212,10 @@ void wxCanvasDC::DrawText(const char* text, double x, double y, Bool combine, Bo
glyph = SCHEME_INT_VAL(SCHEME_VEC_ELS(val)[2]); glyph = SCHEME_INT_VAL(SCHEME_VEC_ELS(val)[2]);
if (glyph < 0) if (glyph < 0)
break; break;
sizes[i-d].width = SCHEME_DBL_VAL(SCHEME_VEC_ELS(val)[0]); one_res = SCHEME_DBL_VAL(SCHEME_VEC_ELS(val)[0]);
if (!use_cgctx)
one_res = one_res / user_scale_y;
sizes[i-d].width = one_res;
sizes[i-d].height = 0; sizes[i-d].height = 0;
cgglyphs[i-d] = (CGGlyph)glyph; cgglyphs[i-d] = (CGGlyph)glyph;
} }