From 4f597bf730b9dc2240a50926cad6124466c95f5b Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Wed, 16 Feb 2011 09:43:57 +0000 Subject: [PATCH] Evas textblock: Fixed an issue with item size calculation. This caused some issues in some cases. Just switch continue with a goto to the end of the loop so we'll be able to calculate the sizes even when we don't need to format the format item. SVN revision: 57081 --- legacy/evas/src/lib/canvas/evas_object_textblock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c index a70a5bb8d2..12d6bbfa68 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textblock.c +++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c @@ -2206,7 +2206,7 @@ _layout_line_finalize(Ctxt *c, Evas_Object_Textblock_Format *fmt) else { Evas_Object_Textblock_Format_Item *fi = _ITEM_FORMAT(it); - if (!fi->formatme) continue; + if (!fi->formatme) goto loop_advance; fi->ascent = c->maxascent; fi->descent = c->maxdescent; /* Adjust sizes according to current line height/scale */ @@ -2305,6 +2305,7 @@ _layout_line_finalize(Ctxt *c, Evas_Object_Textblock_Format *fmt) } } +loop_advance: it->x = x; x += it->adv;