forked from enlightenment/efl
Evas textblock: render should be allowed to be passed an object with no paragraphs, but should just return and do nothing.
SVN revision: 51263
This commit is contained in:
parent
8f7a06e5ee
commit
35f14c47e2
|
@ -6788,6 +6788,10 @@ evas_object_textblock_render(Evas_Object *obj, void *output, void *context, void
|
||||||
obj->layer->evas->engine.func->context_multiplier_unset(output,
|
obj->layer->evas->engine.func->context_multiplier_unset(output,
|
||||||
context);
|
context);
|
||||||
clip = ENFN->context_clip_get(output, context, &cx, &cy, &cw, &ch);
|
clip = ENFN->context_clip_get(output, context, &cx, &cy, &cw, &ch);
|
||||||
|
/* If there are no paragraphs and thus there are no lines,
|
||||||
|
* there's nothing left to do. */
|
||||||
|
if (!o->paragraphs) return;
|
||||||
|
|
||||||
#define ITEM_WALK() \
|
#define ITEM_WALK() \
|
||||||
EINA_INLIST_FOREACH(o->paragraphs->lines, ln) \
|
EINA_INLIST_FOREACH(o->paragraphs->lines, ln) \
|
||||||
{ \
|
{ \
|
||||||
|
@ -6818,7 +6822,7 @@ evas_object_textblock_render(Evas_Object *obj, void *output, void *context, void
|
||||||
if ((obj->cur.geometry.x + x + ln->x + it->x - it->inset) > (cx + cw + 20)) \
|
if ((obj->cur.geometry.x + x + ln->x + it->x - it->inset) > (cx + cw + 20)) \
|
||||||
break; \
|
break; \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define ITEM_WALK_END() \
|
#define ITEM_WALK_END() \
|
||||||
} \
|
} \
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue