diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2012-12-05 20:27:47 -0500 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2012-12-05 20:28:45 -0500 |
| commit | b359bb484bc7d27a835cfd6d9ffcaed582ebf2ae (patch) | |
| tree | c1b9158302e719ca50f9d8b530689814af950603 | |
| parent | d1a8997ac29764dd160a4cad7b291669ae6f5b36 (diff) | |
| download | pango-b359bb484bc7d27a835cfd6d9ffcaed582ebf2ae.tar.gz | |
Fix Win32 and CoreText cairo backends to take cairo CTM into account
| -rw-r--r-- | pango/pangocairo-coretextfont.c | 2 | ||||
| -rw-r--r-- | pango/pangocairo-win32font.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/pango/pangocairo-coretextfont.c b/pango/pangocairo-coretextfont.c index 290a5ccf..0f2a9ef1 100644 --- a/pango/pangocairo-coretextfont.c +++ b/pango/pangocairo-coretextfont.c @@ -220,6 +220,8 @@ _pango_cairo_core_text_font_new (PangoCairoCoreTextFontMap *cafontmap, abs_size = pango_core_text_font_key_get_absolute_size (key); size = pango_units_to_double (abs_size); + size /= pango_matrix_get_font_scale_factor (pango_core_text_font_key_get_matrix (key)); + ctdescriptor = pango_core_text_font_key_get_ctfontdescriptor (key); font_ref = CTFontCreateWithFontDescriptor (ctdescriptor, size, NULL); diff --git a/pango/pangocairo-win32font.c b/pango/pangocairo-win32font.c index 59f7c0f6..61d7d608 100644 --- a/pango/pangocairo-win32font.c +++ b/pango/pangocairo-win32font.c @@ -252,6 +252,9 @@ _pango_cairo_win32_font_new (PangoCairoWin32FontMap *cwfontmap, if (!pango_font_description_get_size_is_absolute (desc)) size *= dpi / 72.; + if (context) + size /= pango_matrix_get_font_scale_factor (pango_context_get_matrix (context)); + #ifdef USE_FACE_CACHED_FONTS win32fontmap = PANGO_WIN32_FONT_MAP (cwfontmap); |