tasn pushed a commit to branch evas-1.7. http://git.enlightenment.org/legacy/evas.git/commit/?id=a56fcabec1e3bb92039693d52af3d19f0dc1ad56
commit a56fcabec1e3bb92039693d52af3d19f0dc1ad56 Author: Youngbok Shin <[email protected]> Date: Fri Oct 18 11:25:59 2013 +0100 evas: Fixed the textblock format to be drawn according to the glyph's horizontal advance width. Summary: Some characters have different two value on glyph's width and horizontal advance width. If the glyph's width is smaller than advance width, format can be drawn weird. Test Plan: Set underline:on to the entry style and just insert the following characters. 。 、 ） （ Reviewers: tasn, woohyun CC: cedric Differential Revision: https://phab.enlightenment.org/D270 --- ChangeLog | 6 ++++++ NEWS | 1 + src/lib/canvas/evas_object_textblock.c | 9 +-------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 13853be..1dabde6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1361,3 +1361,9 @@ * Evas wayland_egl: Do not create a new surface if we already have one. + +2013-10-18 Youngbok Shin + + * Fixed the textblock format to be drawn according to + the glyph's horizontal advance width. + diff --git a/NEWS b/NEWS index 7aa7846..ec6e956 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,7 @@ Fixes: * Evas textblock: Added proper size adjustments for "high" shaped texts. * Evas bidi: Fixed a bug causing BiDi not to work in some cases. * Evas textblock: fixed an issue with markup_get and markup_to_utf8 behaving differently (markup_get was misbehaving). + * Fixed the textblock format to be drawn according to the glyph's horizontal advance width. Evas 1.7.8 diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c index 3ccb098..46c5123 100644 --- a/src/lib/canvas/evas_object_textblock.c +++ b/src/lib/canvas/evas_object_textblock.c @@ -10301,14 +10301,7 @@ evas_object_textblock_render(Evas_Object *obj, void *output, void *context, void _og = itr->format->color.oname.g; \ _ob = itr->format->color.oname.b; \ _oa = itr->format->color.oname.a; \ - if (!EINA_INLIST_GET(itr)->next) \ - { \ - DRAW_RECT(itr->x, oy, itr->w, oh, _or, _og, _ob, _oa); \ - } \ - else \ - { \ - DRAW_RECT(itr->x, oy, itr->adv, oh, _or, _og, _ob, _oa); \ - } \ + DRAW_RECT(itr->x, oy, itr->adv, oh, _or, _og, _ob, _oa); \ } \ } \ while (0) --
