woohyun pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c9cc3ab3f0d018434157913914fb68e49ec602da
commit c9cc3ab3f0d018434157913914fb68e49ec602da
Author: abdulleh Ghujeh <a.ghu...@samsung.com>
Date: Fri Jan 3 16:45:26 2020 +0900
Evas Textblock : Fix obstacles & word overlap
Summary:
Revert part of old commit which caused wrong behavior in textblock with
obstacles, we should use obstacle x pos.
There is no comments about why this was changed.
{F3821294}
Old commit is :
Aug 23, 2017 e63be982d904a01ade5aced9ef9924a78d155b8a
related to D10955
Test Plan: Run Textblock Obstacle example
Reviewers: ali.alzyod, woohyun, segfaultxavi
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D11005
---
src/lib/evas/canvas/evas_object_textblock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/evas/canvas/evas_object_textblock.c
b/src/lib/evas/canvas/evas_object_textblock.c
index 817008c889..3c0d5bf1d1 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -6569,7 +6569,7 @@ _layout_par(Ctxt *c)
Evas_Coord cw = c->w;
if (obs)
{
- cw -= obs->w;
+ cw = obs->x;
}
if (it->format->wrap_word)
wrap = _layout_get_wordwrap(c, it->format, it,
--
