summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2013-11-21 13:12:34 +0900
committerChunEon Park <hermet@hermet.pe.kr>2013-11-21 13:12:34 +0900
commit035d573571a80f23077b46937586d71a1f638a54 (patch)
tree7ff6622782037a94d6535137d339ac375aae6d81 /src
parentc28f08a477f7bce7b514b8f9aa58904234be1e03 (diff)
edje - cleaning the code.
keep our code convention.
Diffstat (limited to 'src')
-rw-r--r--src/lib/edje/edje_calc.c61
1 files changed, 31 insertions, 30 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 017c199b3d..b6816ee150 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -3345,24 +3345,27 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
3345#ifdef EDJE_CALC_CACHE 3345#ifdef EDJE_CALC_CACHE
3346 if (ed->all_part_change || 3346 if (ed->all_part_change ||
3347 ep->invalidate || 3347 ep->invalidate ||
3348 state1 >= ep->param1.state || 3348 (state1 >= ep->param1.state) ||
3349 statec >= ep->param1.state || 3349 (statec >= ep->param1.state) ||
3350 statet >= ep->param1.state || 3350 (statet >= ep->param1.state) ||
3351 statec1 >= ep->param1.state || 3351 (statec1 >= ep->param1.state) ||
3352 statel1 >= ep->param1.state || 3352 (statel1 >= ep->param1.state) ||
3353 statep1 >= ep->param1.state || 3353 (statep1 >= ep->param1.state) ||
3354 proxy_invalidate || 3354 proxy_invalidate ||
3355 state || 3355 state ||
3356 ((ep->part->type == EDJE_PART_TYPE_TEXT || ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) && ed->text_part_change)) 3356 ((ep->part->type == EDJE_PART_TYPE_TEXT ||
3357 ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) &&
3358 ed->text_part_change))
3357#endif 3359#endif
3358 { 3360 {
3359 _edje_part_recalc_single(ed, ep, ep->param1.description, chosen_desc, center[0], light[0], persp[0], 3361 _edje_part_recalc_single(ed, ep, ep->param1.description,
3360 rp1[Rel1X], rp1[Rel1Y], rp1[Rel2X], rp1[Rel2Y], 3362 chosen_desc, center[0], light[0],
3361 confine_to, threshold, 3363 persp[0], rp1[Rel1X], rp1[Rel1Y],
3362 p1, ep->param1.set, mmw, mmh, pos); 3364 rp1[Rel2X], rp1[Rel2Y], confine_to,
3365 threshold, p1, ep->param1.set, mmw, mmh,
3366 pos);
3363#ifdef EDJE_CALC_CACHE 3367#ifdef EDJE_CALC_CACHE
3364 if (flags == FLAG_XY) 3368 if (flags == FLAG_XY) ep->param1.state = ed->state;
3365 ep->param1.state = ed->state;
3366#endif 3369#endif
3367 } 3370 }
3368 } 3371 }
@@ -3410,29 +3413,27 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
3410 3413
3411 if (ed->all_part_change || 3414 if (ed->all_part_change ||
3412 ep->invalidate || 3415 ep->invalidate ||
3413 state2 >= ep->param2->state || 3416 (state2 >= ep->param2->state) ||
3414 statec >= ep->param2->state || 3417 (statec >= ep->param2->state) ||
3415 statet >= ep->param2->state || 3418 (statet >= ep->param2->state) ||
3416 statec2 >= ep->param2->state || 3419 (statec2 >= ep->param2->state) ||
3417 statel2 >= ep->param2->state || 3420 (statel2 >= ep->param2->state) ||
3418 statep2 >= ep->param2->state || 3421 (statep2 >= ep->param2->state) ||
3419 proxy_invalidate || 3422 proxy_invalidate ||
3420 state || 3423 state ||
3421 ((ep->part->type == EDJE_PART_TYPE_TEXT || ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) && ed->text_part_change)) 3424 ((ep->part->type == EDJE_PART_TYPE_TEXT ||
3425 ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) &&
3426 ed->text_part_change))
3422#endif 3427#endif
3423 { 3428 {
3424 _edje_part_recalc_single(ed, ep, ep->param2->description, 3429 _edje_part_recalc_single(ed, ep, ep->param2->description,
3425 chosen_desc, 3430 chosen_desc, center[1], light[1],
3426 center[1], light[1], persp[1], 3431 persp[1], rp2[Rel1X], rp2[Rel1Y],
3427 rp2[Rel1X], 3432 rp2[Rel2X], rp2[Rel2Y], confine_to,
3428 rp2[Rel1Y], 3433 threshold, p2, ep->param2->set, mmw, mmh,
3429 rp2[Rel2X], 3434 pos);
3430 rp2[Rel2Y],
3431 confine_to, threshold,
3432 p2, ep->param2->set, mmw, mmh, pos);
3433#ifdef EDJE_CALC_CACHE 3435#ifdef EDJE_CALC_CACHE
3434 if (flags == FLAG_XY) 3436 if (flags == FLAG_XY) ep->param2->state = ed->state;
3435 ep->param2->state = ed->state;
3436#endif 3437#endif
3437 } 3438 }
3438 3439