Evas font: Fixed runtime emboldenment of bitmap fonts.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@73578 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index 4057166..8618a81 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -877,3 +877,6 @@
 
        * Let Draw Text with viewport size instead of window size. When map is enabled then it should be rendered completely.
 
+2012-07-11  Tom Hacohen (TAsn)
+
+       * Fixed runtime emboldenment with bitmap fonts.

diff --git a/src/bin/evas_cserve2_fonts.c b/src/bin/evas_cserve2_fonts.c
index 08ed4ae..ce93922 100644 (file)
--- a/src/bin/evas_cserve2_fonts.c
+++ b/src/bin/evas_cserve2_fonts.c
@@ -314,9 +314,7 @@ _font_slave_glyph_load(Font_Info *fi, unsigned int idx, unsigned int hint)
      FT_Outline_Transform(&fsi->face->glyph->outline, &transform);
    /* Embolden the outline of Glyph according to rundtime_rend. */
    if (fi->runtime_rend & FONT_REND_WEIGHT)
-     FT_Outline_Embolden(&fsi->face->glyph->outline,
-                         (fsi->face->size->metrics.x_ppem * 5 * 64) /
-                         100);
+      FT_GlyphSlot_Embolden(fsi->face->glyph);
 
    return EINA_TRUE;
 }

diff --git a/src/lib/engines/common/evas_font_main.c b/src/lib/engines/common/evas_font_main.c
index 1977337..4f271e0 100644 (file)
--- a/src/lib/engines/common/evas_font_main.c
+++ b/src/lib/engines/common/evas_font_main.c
@@ -422,8 +422,7 @@ evas_common_font_int_cache_glyph_get(RGBA_Font_Int *fi, FT_UInt idx)
       FT_Outline_Transform(&fi->src->ft.face->glyph->outline, &transform);
    /* Embolden the outline of Glyph according to rundtime_rend. */
    if (fi->runtime_rend & FONT_REND_WEIGHT)
-      FT_Outline_Embolden(&fi->src->ft.face->glyph->outline,
-            (fi->src->ft.face->size->metrics.x_ppem * 5 * 64) / 100);
+      FT_GlyphSlot_Embolden(fi->src->ft.face->glyph);
 
    fg = malloc(sizeof(struct _RGBA_Font_Glyph));
    if (!fg) return NULL;