Evas textblock: Fixed an issue with in-line valign.
Thanks to SeoZ for the report. SVN revision: 61365
This commit is contained in:
parent
b976ff8adf
commit
77978d965a
|
@ -8461,12 +8461,13 @@ evas_object_textblock_render(Evas_Object *obj, void *output, void *context, void
|
||||||
} \
|
} \
|
||||||
EINA_INLIST_FOREACH(ln->items, itr) \
|
EINA_INLIST_FOREACH(ln->items, itr) \
|
||||||
{ \
|
{ \
|
||||||
int yoff; \
|
Evas_Coord yoff; \
|
||||||
yoff = ln->baseline; \
|
yoff = ln->baseline; \
|
||||||
|
/* FIXME: This looks correct, but it breaks stuff....
|
||||||
|
* yoff = (itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? \
|
||||||
|
_ITEM_TEXT(itr)->baseline : ln->baseline; */ \
|
||||||
if (itr->format->valign != -1.0) \
|
if (itr->format->valign != -1.0) \
|
||||||
yoff = (itr->format->valign * (double)(ln->h - itr->h)) + \
|
yoff += itr->format->valign * (ln->h - itr->h); \
|
||||||
(itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? \
|
|
||||||
_ITEM_TEXT(itr)->baseline : ln->baseline; \
|
|
||||||
if (clip) \
|
if (clip) \
|
||||||
{ \
|
{ \
|
||||||
if ((obj->cur.geometry.x + x + ln->x + itr->x + itr->w) < (cx - 20)) \
|
if ((obj->cur.geometry.x + x + ln->x + itr->x + itr->w) < (cx - 20)) \
|
||||||
|
|
Loading…
Reference in New Issue