From 3a4d39955d81626696d859757a080fc9d9bf0cc4 Mon Sep 17 00:00:00 2001 From: tasn Date: Thu, 26 Aug 2010 11:14:03 +0000 Subject: [PATCH] Evas textblock: Fixed tab causing weird spacing and unwanted linewraps. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@51655 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/canvas/evas_object_textblock.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c index 70c634a..79f36e7 100644 --- a/src/lib/canvas/evas_object_textblock.c +++ b/src/lib/canvas/evas_object_textblock.c @@ -2902,14 +2902,15 @@ _layout_do_format(const Evas_Object *obj, Ctxt *c, Evas_Object_Textblock_Format_Item *fi; int x2; - x2 = (fmt->tabstops * ((c->x + fmt->tabstops) / fmt->tabstops)); - if (x2 > + x2 = c->x + fmt->tabstops; + /* Wrap lines if there's a size */ + if ((c->w > 0) && (x2 > (c->w - c->o->style_pad.l - c->o->style_pad.r - - c->marginl - c->marginr)) + c->marginl - c->marginr))) { _layout_line_advance(c, fmt); - x2 = (fmt->tabstops * ((c->x + fmt->tabstops) / fmt->tabstops)); + x2 = c->x + fmt->tabstops; } if (c->ln->items) { -- 2.7.4