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

evas_textblock: Make maxascent/maxdescent variables local. 

They are used in single function, so don't keep them in structure.
As a side-effect rework _layout_line_advance for better readability.

SVN revision: 46872
This commit is contained in:
Mikhail Gusarov 2010-03-04 15:02:10 +00:00
parent 4d49bef2fd
commit a5a07377f6
1 changed files with 57 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1278,7 +1278,6 @@ struct _Ctxt
int x, y; int x, y;
int w, h; int w, h;
int wmax, hmax; int wmax, hmax;
int maxascent, maxdescent;
int marginl, marginr; int marginl, marginr;
int line_no; int line_no;
int underline_extend; int underline_extend;
@ -1287,7 +1286,8 @@ struct _Ctxt
}; };
static void static void
_layout_format_ascent_descent_adjust(Ctxt *c, Evas_Object_Textblock_Format *fmt) _layout_format_ascent_descent_adjust(Ctxt *c, Evas_Object_Textblock_Format *fmt,
int *maxascent, int *maxdescent)
{ {
int ascent, descent; int ascent, descent;
@ -1308,8 +1308,8 @@ _layout_format_ascent_descent_adjust(Ctxt *c, Evas_Object_Textblock_Format *fmt)
descent = ((ascent + descent) * fmt->linerelsize) - (ascent * fmt->linerelsize); descent = ((ascent + descent) * fmt->linerelsize) - (ascent * fmt->linerelsize);
ascent = ascent * fmt->linerelsize; ascent = ascent * fmt->linerelsize;
} }
if (c->maxascent < ascent) c->maxascent = ascent; if (*maxascent < ascent) *maxascent = ascent;
if (c->maxdescent < descent) c->maxdescent = descent; if (*maxdescent < descent) *maxdescent = descent;
} }
} }
@ -1322,9 +1322,7 @@ _layout_line_new(Ctxt *c, Evas_Object_Textblock_Format *fmt)
c->marginr = fmt->margin.r; c->marginr = fmt->margin.r;
c->lines = (Evas_Object_Textblock_Line *)eina_inlist_append(EINA_INLIST_GET(c->lines), EINA_INLIST_GET(c->ln)); c->lines = (Evas_Object_Textblock_Line *)eina_inlist_append(EINA_INLIST_GET(c->lines), EINA_INLIST_GET(c->ln));
c->x = 0; c->x = 0;
c->maxascent = c->maxdescent = 0;
c->ln->line_no = -1; c->ln->line_no = -1;
_layout_format_ascent_descent_adjust(c, fmt);
} }
static Evas_Object_Textblock_Format * static Evas_Object_Textblock_Format *
@ -1377,52 +1375,72 @@ _layout_format_value_handle(Ctxt *c, Evas_Object_Textblock_Format *fmt, char *it
} }
static void static void
_layout_line_advance(Ctxt *c, Evas_Object_Textblock_Format *fmt) _layout_line_finish(Ctxt* c, Evas_Object_Textblock_Format *fmt)
{ {
Evas_Object_Textblock_Item *it; Evas_Object_Textblock_Item *it;
c->maxascent = c->maxdescent = 0; /* Calculate maxascent, maxdescent for current line */
if (!c->ln->items) int maxascent = 0;
_layout_format_ascent_descent_adjust(c, fmt); int maxdescent = 0;
EINA_INLIST_FOREACH(c->ln->items, it)
{
int endx;
if (it->format->font.font) if (!c->ln->items)
it->baseline = c->ENFN->font_max_ascent_get(c->ENDT, it->format->font.font); _layout_format_ascent_descent_adjust(c, fmt, &maxascent, &maxdescent);
_layout_format_ascent_descent_adjust(c, it->format); EINA_INLIST_FOREACH(c->ln->items, it)
endx = it->x + it->w; _layout_format_ascent_descent_adjust(c, it->format, &maxascent, &maxdescent);
if (endx > c->ln->w) c->ln->w = endx;
} /* Fill in baseline for each textblock item */
EINA_INLIST_FOREACH(c->ln->items, it)
if (it->format->font.font)
it->baseline = c->ENFN->font_max_ascent_get(c->ENDT, it->format->font.font);
/* Calculate width of line */
EINA_INLIST_FOREACH(c->ln->items, it)
if (it->x + it->w + c->ln->w) c->ln->w = it->x + it->w;
/* Adjust (?) line vertical position */
c->ln->y = c->y + c->o->style_pad.t; c->ln->y = c->y + c->o->style_pad.t;
c->ln->h = c->maxascent + c->maxdescent;
c->ln->baseline = c->maxascent; /* Calculate line height */
c->ln->h = maxascent + maxdescent;
/* Calculate (???) line baseline */
c->ln->baseline = maxascent;
/* Calculate adjustments for underline */
if (c->have_underline2) if (c->have_underline2)
{ {
if (c->maxdescent < 4) c->underline_extend = 4 - c->maxdescent; if (maxdescent < 4) c->underline_extend = 4 - maxdescent;
} }
else if (c->have_underline) else if (c->have_underline)
{ {
if (c->maxdescent < 2) c->underline_extend = 2 - c->maxdescent; if (maxdescent < 2) c->underline_extend = 2 - maxdescent;
} }
/* Store current line number */
c->ln->line_no = c->line_no; c->ln->line_no = c->line_no;
c->line_no++; c->line_no++;
c->y += c->maxascent + c->maxdescent;
if (c->w >= 0) /* Calculate current position in context for next line */
{ c->y += c->ln->h;
c->ln->x = c->marginl + c->o->style_pad.l +
((c->w - c->ln->w - /* Calculate line horizontal position and c->wmax */
c->o->style_pad.l - c->o->style_pad.r -
c->marginl - c->marginr) * c->align); /* If there is no width, align left */
if ((c->ln->x + c->ln->w + c->marginr - c->o->style_pad.l) > c->wmax) double align = c->w >= 0 ? c->align : 0.0;
c->wmax = c->ln->x + c->ln->w + c->marginl + c->marginr - c->o->style_pad.l;
} c->ln->x = c->marginl + c->o->style_pad.l +
else ((c->w - c->ln->w -
{ c->o->style_pad.l - c->o->style_pad.r -
c->ln->x = c->marginl + c->o->style_pad.l; c->marginl - c->marginr) * c->align);
if ((c->ln->x + c->ln->w + c->marginr - c->o->style_pad.l) > c->wmax) if ((c->ln->x + c->ln->w + c->marginr - c->o->style_pad.l) > c->wmax)
c->wmax = c->ln->x + c->ln->w + c->marginl + c->marginr - c->o->style_pad.l; c->wmax = c->ln->x + c->ln->w + c->marginl + c->marginr - c->o->style_pad.l;
} }
static void
_layout_line_advance(Ctxt *c, Evas_Object_Textblock_Format *fmt)
{
_layout_line_finish(c, fmt);
_layout_line_new(c, fmt); _layout_line_new(c, fmt);
} }
@ -1980,7 +1998,6 @@ _layout(const Evas_Object *obj, int calc_only, int w, int h, int *w_ret, int *h_
c->w = w; c->w = w;
c->h = h; c->h = h;
c->wmax = c->hmax = 0; c->wmax = c->hmax = 0;
c->maxascent = c->maxdescent = 0;
c->marginl = c->marginr = 0; c->marginl = c->marginr = 0;
c->have_underline = 0; c->have_underline = 0;
c->have_underline2 = 0; c->have_underline2 = 0;