orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Evas textblock: Implemented vertical alignment - no way to set it yet. 

Implemented the code needed, but there's still no way to set it.
This should be discussed. Not sure whether this should be part of
the API, or should just be set in the default style.

SVN revision: 58185
This commit is contained in:
Tom Hacohen 2011-03-29 14:14:29 +00:00
parent a9fb04ffb0
commit a2cecf5ea7
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
legacy/evas/src/lib/canvas/evas_object_textblock.c
View File

@ -1793,7 +1793,7 @@ struct _Ctxt
int line_no;
int underline_extend;
int have_underline, have_underline2;
double align;
double align, valign;
Eina_Bool align_auto;
};
@ -3486,6 +3486,7 @@ _layout(const Evas_Object *obj, int calc_only, int w, int h, int *w_ret, int *h_
c->line_no = 0;
c->align = 0.0;
c->align_auto = EINA_TRUE;
c->valign = 0.0;
c->ln = NULL;
@ -3688,6 +3689,19 @@ _layout(const Evas_Object *obj, int calc_only, int w, int h, int *w_ret, int *h_
if (w_ret) *w_ret = c->wmax;
if (h_ret) *h_ret = c->hmax;
/* Is this really the place? */
/* Vertically align the textblock */
if ((c->valign > 0.0) && (c->h > c->hmax))
{
Evas_Coord adjustment = (c->h - c->hmax) * c->valign;
Evas_Object_Textblock_Paragraph *par;
EINA_INLIST_FOREACH(c->paragraphs, par)
{
par->y += adjustment;
}
}
if ((o->style_pad.l != style_pad_l) || (o->style_pad.r != style_pad_r) ||
(o->style_pad.t != style_pad_t) || (o->style_pad.b != style_pad_b))
{