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

* edje_calc: Cleanup calc structure. 

SVN revision: 41744
This commit is contained in:
Cedric BAIL 2009-08-13 16:13:49 +00:00
parent b559c260fa
commit eff22017dc
3 changed files with 76 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
legacy/edje/src/lib/edje_calc.c
View File

@ -1295,25 +1295,25 @@ _edje_part_recalc_single(Edje *ed,
/* text colors */
if (cc)
{
params->color2.r = (((int)cc->r2 + 1) * desc->color2.r) >> 8;
params->color2.g = (((int)cc->g2 + 1) * desc->color2.g) >> 8;
params->color2.b = (((int)cc->b2 + 1) * desc->color2.b) >> 8;
params->color2.a = (((int)cc->a2 + 1) * desc->color2.a) >> 8;
params->color3.r = (((int)cc->r3 + 1) * desc->color3.r) >> 8;
params->color3.g = (((int)cc->g3 + 1) * desc->color3.g) >> 8;
params->color3.b = (((int)cc->b3 + 1) * desc->color3.b) >> 8;
params->color3.a = (((int)cc->a3 + 1) * desc->color3.a) >> 8;
params->type.text.color2.r = (((int)cc->r2 + 1) * desc->color2.r) >> 8;
params->type.text.color2.g = (((int)cc->g2 + 1) * desc->color2.g) >> 8;
params->type.text.color2.b = (((int)cc->b2 + 1) * desc->color2.b) >> 8;
params->type.text.color2.a = (((int)cc->a2 + 1) * desc->color2.a) >> 8;
params->type.text.color3.r = (((int)cc->r3 + 1) * desc->color3.r) >> 8;
params->type.text.color3.g = (((int)cc->g3 + 1) * desc->color3.g) >> 8;
params->type.text.color3.b = (((int)cc->b3 + 1) * desc->color3.b) >> 8;
params->type.text.color3.a = (((int)cc->a3 + 1) * desc->color3.a) >> 8;
}
else
{
params->color2.r = desc->color2.r;
params->color2.g = desc->color2.g;
params->color2.b = desc->color2.b;
params->color2.a = desc->color2.a;
params->color3.r = desc->color3.r;
params->color3.g = desc->color3.g;
params->color3.b = desc->color3.b;
params->color3.a = desc->color3.a;
params->type.text.color2.r = desc->color2.r;
params->type.text.color2.g = desc->color2.g;
params->type.text.color2.b = desc->color2.b;
params->type.text.color2.a = desc->color2.a;
params->type.text.color3.r = desc->color3.r;
params->type.text.color3.g = desc->color3.g;
params->type.text.color3.b = desc->color3.b;
params->type.text.color3.a = desc->color3.a;
}
break;
case EDJE_PART_TYPE_RECTANGLE:
@ -1772,15 +1772,15 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags)
case EDJE_PART_TYPE_TEXT:
p3->type.text.size = INTP(p1->type.text.size, p2->type.text.size, pos);
case EDJE_PART_TYPE_TEXTBLOCK:
p3->color2.r = INTP(p1->color2.r, p2->color2.r, pos);
p3->color2.g = INTP(p1->color2.g, p2->color2.g, pos);
p3->color2.b = INTP(p1->color2.b, p2->color2.b, pos);
p3->color2.a = INTP(p1->color2.a, p2->color2.a, pos);
p3->type.text.color2.r = INTP(p1->type.text.color2.r, p2->type.text.color2.r, pos);
p3->type.text.color2.g = INTP(p1->type.text.color2.g, p2->type.text.color2.g, pos);
p3->type.text.color2.b = INTP(p1->type.text.color2.b, p2->type.text.color2.b, pos);
p3->type.text.color2.a = INTP(p1->type.text.color2.a, p2->type.text.color2.a, pos);
p3->color3.r = INTP(p1->color3.r, p2->color3.r, pos);
p3->color3.g = INTP(p1->color3.g, p2->color3.g, pos);
p3->color3.b = INTP(p1->color3.b, p2->color3.b, pos);
p3->color3.a = INTP(p1->color3.a, p2->color3.a, pos);
p3->type.text.color3.r = INTP(p1->type.text.color3.r, p2->type.text.color3.r, pos);
p3->type.text.color3.g = INTP(p1->type.text.color3.g, p2->type.text.color3.g, pos);
p3->type.text.color3.b = INTP(p1->type.text.color3.b, p2->type.text.color3.b, pos);
p3->type.text.color3.a = INTP(p1->type.text.color3.a, p2->type.text.color3.a, pos);
p3->type.text.align.x = INTP(p1->type.text.align.x, p2->type.text.align.x, pos);
p3->type.text.align.y = INTP(p1->type.text.align.y, p2->type.text.align.y, pos);

7
legacy/edje/src/lib/edje_private.h
View File

@ -740,7 +740,7 @@ struct _Edje_Calc_Params
int angle; // 4
int spread; // 4
} fill;
Edje_Color color, color2, color3; // 12
Edje_Color color; // 4
union {
struct {
int l, r, t, b; // 16
@ -749,12 +749,13 @@ struct _Edje_Calc_Params
Edje_Alignment align; /* text alignment within bounds */ // 16
double elipsis; // 8
int size; // 4
} text; // 28
Edje_Color color2, color3; // 8
} text; // 36
struct {
int id; // 4
char *type; // 4
} gradient; // 8
} type; // 28
} type; // 36
unsigned char visible : 1;
unsigned char smooth : 1; // 4
}; // 116

96
legacy/edje/src/lib/edje_text.c
View File

@ -579,97 +579,97 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
{
style = EVAS_TEXT_STYLE_OUTLINE;
evas_object_text_outline_color_set(ep->object,
(params->color2.r * params->color2.a) / 255,
(params->color2.g * params->color2.a) / 255,
(params->color2.b * params->color2.a) / 255,
params->color2.a);
(params->type.text.color2.r * params->type.text.color2.a) / 255,
(params->type.text.color2.g * params->type.text.color2.a) / 255,
(params->type.text.color2.b * params->type.text.color2.a) / 255,
params->type.text.color2.a);
}
else if (ep->part->effect == EDJE_TEXT_EFFECT_SOFT_OUTLINE)
{
style = EVAS_TEXT_STYLE_SOFT_OUTLINE;
evas_object_text_outline_color_set(ep->object,
(params->color2.r * params->color2.a) / 255,
(params->color2.g * params->color2.a) / 255,
(params->color2.b * params->color2.a) / 255,
params->color2.a);
(params->type.text.color2.r * params->type.text.color2.a) / 255,
(params->type.text.color2.g * params->type.text.color2.a) / 255,
(params->type.text.color2.b * params->type.text.color2.a) / 255,
params->type.text.color2.a);
}
else if (ep->part->effect == EDJE_TEXT_EFFECT_SHADOW)
{
style = EVAS_TEXT_STYLE_SHADOW;
evas_object_text_shadow_color_set(ep->object,
(params->color3.r * params->color3.a) / 255,
(params->color3.g * params->color3.a) / 255,
(params->color3.b * params->color3.a) / 255,
params->color3.a);
(params->type.text.color3.r * params->type.text.color3.a) / 255,
(params->type.text.color3.g * params->type.text.color3.a) / 255,
(params->type.text.color3.b * params->type.text.color3.a) / 255,
params->type.text.color3.a);
}
else if (ep->part->effect == EDJE_TEXT_EFFECT_SOFT_SHADOW)
{
style = EVAS_TEXT_STYLE_SOFT_SHADOW;
evas_object_text_shadow_color_set(ep->object,
(params->color3.r * params->color3.a) / 255,
(params->color3.g * params->color3.a) / 255,
(params->color3.b * params->color3.a) / 255,
params->color3.a);
(params->type.text.color3.r * params->type.text.color3.a) / 255,
(params->type.text.color3.g * params->type.text.color3.a) / 255,
(params->type.text.color3.b * params->type.text.color3.a) / 255,
params->type.text.color3.a);
}
else if (ep->part->effect == EDJE_TEXT_EFFECT_OUTLINE_SHADOW)
{
style = EVAS_TEXT_STYLE_OUTLINE_SHADOW;
evas_object_text_outline_color_set(ep->object,
(params->color2.r * params->color2.a) / 255,
(params->color2.g * params->color2.a) / 255,
(params->color2.b * params->color2.a) / 255,
params->color2.a);
(params->type.text.color2.r * params->type.text.color2.a) / 255,
(params->type.text.color2.g * params->type.text.color2.a) / 255,
(params->type.text.color2.b * params->type.text.color2.a) / 255,
params->type.text.color2.a);
evas_object_text_shadow_color_set(ep->object,
(params->color3.r * params->color3.a) / 255,
(params->color3.g * params->color3.a) / 255,
(params->color3.b * params->color3.a) / 255,
params->color3.a);
(params->type.text.color3.r * params->type.text.color3.a) / 255,
(params->type.text.color3.g * params->type.text.color3.a) / 255,
(params->type.text.color3.b * params->type.text.color3.a) / 255,
params->type.text.color3.a);
}
else if (ep->part->effect == EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW)
{
style = EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW;
evas_object_text_outline_color_set(ep->object,
(params->color2.r * params->color2.a) / 255,
(params->color2.g * params->color2.a) / 255,
(params->color2.b * params->color2.a) / 255,
params->color2.a);
(params->type.text.color2.r * params->type.text.color2.a) / 255,
(params->type.text.color2.g * params->type.text.color2.a) / 255,
(params->type.text.color2.b * params->type.text.color2.a) / 255,
params->type.text.color2.a);
evas_object_text_shadow_color_set(ep->object,
(params->color3.r * params->color3.a) / 255,
(params->color3.g * params->color3.a) / 255,
(params->color3.b * params->color3.a) / 255,
params->color3.a);
(params->type.text.color3.r * params->type.text.color3.a) / 255,
(params->type.text.color3.g * params->type.text.color3.a) / 255,
(params->type.text.color3.b * params->type.text.color3.a) / 255,
params->type.text.color3.a);
}
else if (ep->part->effect == EDJE_TEXT_EFFECT_FAR_SHADOW)
{
style = EVAS_TEXT_STYLE_FAR_SHADOW;
evas_object_text_shadow_color_set(ep->object,
(params->color3.r * params->color3.a) / 255,
(params->color3.g * params->color3.a) / 255,
(params->color3.b * params->color3.a) / 255,
params->color3.a);
(params->type.text.color3.r * params->type.text.color3.a) / 255,
(params->type.text.color3.g * params->type.text.color3.a) / 255,
(params->type.text.color3.b * params->type.text.color3.a) / 255,
params->type.text.color3.a);
}
else if (ep->part->effect == EDJE_TEXT_EFFECT_FAR_SOFT_SHADOW)
{
style = EVAS_TEXT_STYLE_FAR_SOFT_SHADOW;
evas_object_text_shadow_color_set(ep->object,
(params->color3.r * params->color3.a) / 255,
(params->color3.g * params->color3.a) / 255,
(params->color3.b * params->color3.a) / 255,
params->color3.a);
(params->type.text.color3.r * params->type.text.color3.a) / 255,
(params->type.text.color3.g * params->type.text.color3.a) / 255,
(params->type.text.color3.b * params->type.text.color3.a) / 255,
params->type.text.color3.a);
}
else if (ep->part->effect == EDJE_TEXT_EFFECT_GLOW)
{
style = EVAS_TEXT_STYLE_GLOW;
evas_object_text_glow_color_set(ep->object,
(params->color2.r * params->color2.a) / 255,
(params->color2.g * params->color2.a) / 255,
(params->color2.b * params->color2.a) / 255,
params->color2.a);
(params->type.text.color2.r * params->type.text.color2.a) / 255,
(params->type.text.color2.g * params->type.text.color2.a) / 255,
(params->type.text.color2.b * params->type.text.color2.a) / 255,
params->type.text.color2.a);
evas_object_text_glow2_color_set(ep->object,
(params->color3.r * params->color3.a) / 255,
(params->color3.g * params->color3.a) / 255,
(params->color3.b * params->color3.a) / 255,
params->color3.a);
(params->type.text.color3.r * params->type.text.color3.a) / 255,
(params->type.text.color3.g * params->type.text.color3.a) / 255,
(params->type.text.color3.b * params->type.text.color3.a) / 255,
params->type.text.color3.a);
}
evas_object_text_style_set(ep->object, style);
}