diff options
| author | Jim Evins <evins@snaught.com> | 2012-07-08 13:01:12 -0400 |
|---|---|---|
| committer | Jim Evins <evins@snaught.com> | 2012-07-08 13:01:12 -0400 |
| commit | c691553a05723f7802f2356a3ed4d096ee1feab1 (patch) | |
| tree | 15f474d27d7f1b90d889244aef027ae42667e940 | |
| parent | 61788fad790e275ba45005302341c2f5d890d7ca (diff) | |
Fix font scaling problem.
Fixes bug #679531. Don't apply font scale twice when "Allow merge to
automatically shrink text." This also correctly applies font scale when
line spacing is not 1.
| -rw-r--r-- | src/label-text.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/label-text.c b/src/label-text.c index b2a3231..1030d18 100644 --- a/src/label-text.c +++ b/src/label-text.c @@ -1111,13 +1111,13 @@ set_text_path (glLabelText *this, style = this->priv->font_italic_flag ? PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL; - font_size = this->priv->font_size; + font_size = this->priv->font_size * FONT_SCALE; auto_shrink = gl_label_text_get_auto_shrink (this); if (!screen_flag && record && auto_shrink && (raw_w != 0.0)) { font_size = auto_shrink_font_size (cr, this->priv->font_family, - this->priv->font_size * FONT_SCALE, + font_size, this->priv->font_weight, style, text, @@ -1136,7 +1136,7 @@ set_text_path (glLabelText *this, desc = pango_font_description_new (); pango_font_description_set_family (desc, this->priv->font_family); pango_font_description_set_weight (desc, this->priv->font_weight); - pango_font_description_set_size (desc, font_size * FONT_SCALE * PANGO_SCALE); + pango_font_description_set_size (desc, font_size * PANGO_SCALE); pango_font_description_set_style (desc, style); pango_layout_set_font_description (layout, desc); pango_font_description_free (desc); |