summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoungbok Shin <youngb.shin@samsung.com>2013-10-18 11:25:59 +0100
committerTom Hacohen <tom@stosb.com>2013-10-18 11:25:59 +0100
commitd17e0d39369b0c6a9dfb596688a38615dd25922d (patch)
treee7bf7464545612468411fece60daf21a35c00347
parent91565c48e3be1c79a6a2e3d7295725bf4a1b58c4 (diff)
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
-rw-r--r--ChangeLog5
-rw-r--r--NEWS1
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c9
3 files changed, 7 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index aaf58a1f39..d952a2258b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12013-10-18 Youngbok Shin
2
3 * Fixed the textblock format to be drawn according to
4 the glyph's horizontal advance width.
5
12013-10-15 ChunEon Park (Hermet) 62013-10-15 ChunEon Park (Hermet)
2 7
3 * Fixed the map surface to be updated properly. By tranversing the 8 * Fixed the map surface to be updated properly. By tranversing the
diff --git a/NEWS b/NEWS
index 000fe0daeb..99ca54a673 100644
--- a/NEWS
+++ b/NEWS
@@ -357,6 +357,7 @@ Fixes:
357 - Evas bidi: Fixed a bug causing BiDi not to work in some cases. 357 - Evas bidi: Fixed a bug causing BiDi not to work in some cases.
358 - Evas textblock: fixed an issue with markup_get and markup_to_utf8 behaving differently (markup_get was misbehaving). 358 - Evas textblock: fixed an issue with markup_get and markup_to_utf8 behaving differently (markup_get was misbehaving).
359 - Fixed the map surface to be updated properly. By tranversing the whole of the map target's tree, it decides to update the map surface to be redrawn if one of the objects is changed except the clipper itself. 359 - Fixed the map surface to be updated properly. By tranversing the whole of the map target's tree, it decides to update the map surface to be redrawn if one of the objects is changed except the clipper itself.
360 - Fixed the textblock format to be drawn according to the glyph's horizontal advance width.
360 361
361 * Ecore: 362 * Ecore:
362 - Don't leak fd on exec. 363 - Don't leak fd on exec.
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index acddf83121..0566f9303f 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -10869,14 +10869,7 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
10869 _og = itr->format->color.oname.g; \ 10869 _og = itr->format->color.oname.g; \
10870 _ob = itr->format->color.oname.b; \ 10870 _ob = itr->format->color.oname.b; \
10871 _oa = itr->format->color.oname.a; \ 10871 _oa = itr->format->color.oname.a; \
10872 if (!EINA_INLIST_GET(itr)->next) \ 10872 DRAW_RECT(itr->x, oy, itr->adv, oh, _or, _og, _ob, _oa); \
10873 { \
10874 DRAW_RECT(itr->x, oy, itr->w, oh, _or, _og, _ob, _oa); \
10875 } \
10876 else \
10877 { \
10878 DRAW_RECT(itr->x, oy, itr->adv, oh, _or, _og, _ob, _oa); \
10879 } \
10880 } \ 10873 } \
10881 } \ 10874 } \
10882 while (0) 10875 while (0)