summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hirt <hirt.danny@gmail.com>2017-02-06 07:48:25 +0200
committerDaniel Hirt <hirt.danny@gmail.com>2017-05-19 18:44:47 +0300
commit24a8153aaaca479e748fd9cbaa848d73b8a068e1 (patch)
tree93b31c81e24fdcc81e0132d8a10244203c1a3347
parentb8336030ea4b5dd651f0a83779315853f6ee3f1b (diff)
downloadefl-24a8153aaaca479e748fd9cbaa848d73b8a068e1.tar.gz
fix textblock wrapping
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 6448387dae..24bd0ab5ee 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -5545,7 +5545,14 @@ _layout_par(Ctxt *c)
}
/* Check if we need to wrap, i.e the text is bigger than the width,
or we already found a wrap point. */
- if ((c->w >= 0) &&
+ Eina_Bool skip = EINA_FALSE;
+ if ((it->type == EVAS_TEXTBLOCK_ITEM_FORMAT) &&
+ (_IS_LINE_SEPARATOR(_ITEM_FORMAT(it)->item) ||
+ _IS_PARAGRAPH_SEPARATOR_SIMPLE(_ITEM_FORMAT(it)->item)))
+ {
+ skip = EINA_TRUE;
+ }
+ if (!skip && (c->w >= 0) &&
(obs ||
(((c->x + it->w) >
(c->w - c->o->style_pad.l - c->o->style_pad.r -