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

Evas text: Made evas_text_style_pad_get faster. 

SVN revision: 59282
This commit is contained in:
Tom Hacohen 2011-05-08 15:43:44 +00:00
parent 730bfce44e
commit 7cd241ae62
1 changed files with 67 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
legacy/evas/src/lib/canvas/evas_object_text.c
View File

@ -1400,32 +1400,42 @@ void
evas_text_style_pad_get(Evas_Text_Style_Type style, int *l, int *r, int *t, int *b) evas_text_style_pad_get(Evas_Text_Style_Type style, int *l, int *r, int *t, int *b)
{ {
int shad_sz = 0, shad_dst = 0, out_sz = 0; int shad_sz = 0, shad_dst = 0, out_sz = 0;
int dx = 0, minx = 0, maxx = 0, shx1, shx2; int dx = 0, minx = 0, maxx = 0;
int dy = 0, miny = 0, maxy = 0, shy1, shy2; int dy = 0, miny = 0, maxy = 0;
int sl = 0, sr = 0, st = 0, sb = 0; int sl = 0, sr = 0, st = 0, sb = 0;
Eina_Bool have_shadow = EINA_FALSE;
/* Don't calc anything if there's no style. */
if (style == EVAS_TEXT_STYLE_PLAIN)
goto end;
switch (style & EVAS_TEXT_STYLE_MASK_BASIC) switch (style & EVAS_TEXT_STYLE_MASK_BASIC)
{ {
case EVAS_TEXT_STYLE_SHADOW: case EVAS_TEXT_STYLE_SHADOW:
shad_dst = 1; shad_dst = 1;
have_shadow = EINA_TRUE;
break; break;
case EVAS_TEXT_STYLE_OUTLINE_SHADOW: case EVAS_TEXT_STYLE_OUTLINE_SHADOW:
case EVAS_TEXT_STYLE_FAR_SHADOW: case EVAS_TEXT_STYLE_FAR_SHADOW:
shad_dst = 2; shad_dst = 2;
out_sz = 1; out_sz = 1;
have_shadow = EINA_TRUE;
break; break;
case EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW: case EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW:
shad_dst = 1; shad_dst = 1;
shad_sz = 2; shad_sz = 2;
out_sz = 1; out_sz = 1;
have_shadow = EINA_TRUE;
break; break;
case EVAS_TEXT_STYLE_FAR_SOFT_SHADOW: case EVAS_TEXT_STYLE_FAR_SOFT_SHADOW:
shad_dst = 2; shad_dst = 2;
shad_sz = 2; shad_sz = 2;
have_shadow = EINA_TRUE;
break; break;
case EVAS_TEXT_STYLE_SOFT_SHADOW: case EVAS_TEXT_STYLE_SOFT_SHADOW:
shad_dst = 1; shad_dst = 1;
shad_sz = 2; shad_sz = 2;
have_shadow = EINA_TRUE;
break; break;
case EVAS_TEXT_STYLE_GLOW: case EVAS_TEXT_STYLE_GLOW:
case EVAS_TEXT_STYLE_SOFT_OUTLINE: case EVAS_TEXT_STYLE_SOFT_OUTLINE:
@ -1437,59 +1447,64 @@ evas_text_style_pad_get(Evas_Text_Style_Type style, int *l, int *r, int *t, int
default: default:
break; break;
} }
switch (style & EVAS_TEXT_STYLE_MASK_SHADOW_DIRECTION)
{
case EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_RIGHT:
dx = 1;
dy = 1;
break;
case EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM:
dx = 0;
dy = 1;
break;
case EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_LEFT:
dx = -1;
dy = 1;
break;
case EVAS_TEXT_STYLE_SHADOW_DIRECTION_LEFT:
dx = -1;
dy = 0;
break;
case EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_LEFT:
dx = -1;
dy = -1;
break;
case EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP:
dx = 0;
dy = -1;
break;
case EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_RIGHT:
dx = 1;
dy = -1;
break;
case EVAS_TEXT_STYLE_SHADOW_DIRECTION_RIGHT:
dx = 1;
dy = 0;
default:
break;
}
minx = -out_sz; minx = -out_sz;
maxx = out_sz; maxx = out_sz;
shx1 = dx * shad_dst;
shx1 -= shad_sz;
shx2 = dx * shad_dst;
shx2 += shad_sz;
if (shx1 < minx) minx = shx1;
if (shx2 > maxx) maxx = shx2;
miny = -out_sz; miny = -out_sz;
maxy = out_sz; maxy = out_sz;
shy1 = dy * shad_dst; if (have_shadow)
shy1 -= shad_sz; {
shy2 = dy * shad_dst; int shx1, shx2, shy1, shy2;
shy2 += shad_sz; switch (style & EVAS_TEXT_STYLE_MASK_SHADOW_DIRECTION)
if (shy1 < miny) miny = shy1; {
if (shy2 > maxy) maxy = shy2; case EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_RIGHT:
dx = 1;
dy = 1;
break;
case EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM:
dx = 0;
dy = 1;
break;
case EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_LEFT:
dx = -1;
dy = 1;
break;
case EVAS_TEXT_STYLE_SHADOW_DIRECTION_LEFT:
dx = -1;
dy = 0;
break;
case EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_LEFT:
dx = -1;
dy = -1;
break;
case EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP:
dx = 0;
dy = -1;
break;
case EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_RIGHT:
dx = 1;
dy = -1;
break;
case EVAS_TEXT_STYLE_SHADOW_DIRECTION_RIGHT:
dx = 1;
dy = 0;
default:
break;
}
shx1 = dx * shad_dst;
shx1 -= shad_sz;
shx2 = dx * shad_dst;
shx2 += shad_sz;
if (shx1 < minx) minx = shx1;
if (shx2 > maxx) maxx = shx2;
shy1 = dy * shad_dst;
shy1 -= shad_sz;
shy2 = dy * shad_dst;
shy2 += shad_sz;
if (shy1 < miny) miny = shy1;
if (shy2 > maxy) maxy = shy2;
}
if (l) sl = *l; if (l) sl = *l;
if (r) sr = *r; if (r) sr = *r;
@ -1501,6 +1516,7 @@ evas_text_style_pad_get(Evas_Text_Style_Type style, int *l, int *r, int *t, int
if (sb < maxy) sb = maxy; if (sb < maxy) sb = maxy;
if (st < -miny) st = -miny; if (st < -miny) st = -miny;
end:
if (l) *l = sl; if (l) *l = sl;
if (r) *r = sr; if (r) *r = sr;
if (t) *t = st; if (t) *t = st;