From a2eaedecdc3ec77a6d80d1e06be83e908ac0072a Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 8 Aug 2005 19:49:21 +0000 Subject: [PATCH] fixed spacing bug when drawing partly-smoothed text at non-1.0 scale svn: r567 --- src/wxmac/src/mac/wx_dccan3.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/wxmac/src/mac/wx_dccan3.cc b/src/wxmac/src/mac/wx_dccan3.cc index 72090ec9e0..4b5d58c70b 100644 --- a/src/wxmac/src/mac/wx_dccan3.cc +++ b/src/wxmac/src/mac/wx_dccan3.cc @@ -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); int ulen; atomic_timeout_t old; + double one_res; CGSize *sizes; CGGlyph *cgglyphs; 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]); if (glyph < 0) 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; cgglyphs[i-d] = (CGGlyph)glyph; }