summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2013-05-02 13:41:32 -0400
committerBehdad Esfahbod <behdad@behdad.org>2013-05-02 13:41:32 -0400
commit5b38ec2ff9f26b0e3204ba79c1d1b5c0d2b92edb (patch)
tree91c3550a2af4a7769cbe291f3c6932b7bd1c8df3 /pango
parentc184d3ac66c13a10e83431948e19303af19b3242 (diff)
downloadpango-5b38ec2ff9f26b0e3204ba79c1d1b5c0d2b92edb.tar.gz
Fix CoreText font scaling again
This partially reverts 25ad29b488d3e2ae10e4fee25602409fa39207f1 which itself was a revert. Apparently we want the change in CoreText, but not on Win32... See mailing list discussion.
Diffstat (limited to 'pango')
-rw-r--r--pango/pangocairo-coretextfont.c2
1 files changed, 2 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);