/* After this par we are no longer at the beginning, as there
* must be some text in the par. */
- if (c->position == TEXTBLOCK_POSITION_START)
- c->position = TEXTBLOCK_POSITION_ELSE;
+ if (!EINA_INLIST_GET(c->par)->next)
+ {
+ c->position = (c->position == TEXTBLOCK_POSITION_START) ?
+ TEXTBLOCK_POSITION_SINGLE : TEXTBLOCK_POSITION_END;
+ }
+ else
+ {
+ if (c->position == TEXTBLOCK_POSITION_START)
+ c->position = TEXTBLOCK_POSITION_ELSE;
+ }
return 0;
}
Eina_Bool item_preadv = EINA_FALSE;
Evas_Textblock_Obstacle *obs = NULL;
+
+ /* Initialize wmax by 0.
+ It means the width calculation will be processed.
+ So, it does not need to use previous calculated width. */
+ if (c->wmax == -1) c->wmax = 0;
+
for (i = c->par->logical_items ; i ; )
{
Evas_Coord prevdescent = 0, prevascent = 0;
c->x = c->y = 0;
c->w = w;
c->h = h;
- c->wmax = c->hmax = 0;
+ c->wmax = c->hmax = -1;
c->ascent = c->descent = 0;
c->maxascent = c->maxdescent = 0;
c->marginl = c->marginr = 0;
{
Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
- _layout(eo_obj, obj->cur->geometry.w, obj->cur->geometry.h,
- &o->formatted.w, &o->formatted.h);
+ Evas_Coord fw, fh;
+
+ _layout(eo_obj, obj->cur->geometry.w, obj->cur->geometry.h, &fw, &fh);
+
+ /* If formatted width/height from _layout() is -1,
+ It means the size calculation was skipped. */
+ if (fw >= 0) o->formatted.w = fw;
+ if (fh >= 0) o->formatted.h = fh;
o->formatted.valid = 1;
o->formatted.oneline_h = 0;
o->last_w = obj->cur->geometry.w;