enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

edje: use eo more. 

SVN revision: 80519
This commit is contained in:
Cedric BAIL 2012-12-08 09:21:10 +00:00
parent bae5080e50
commit 48638e3ca0
1 changed files with 70 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -676,8 +676,9 @@ _edje_recalc_do(Edje *ed)
ed->recalc_hints = EINA_FALSE; ed->recalc_hints = EINA_FALSE;
edje_object_size_min_calc(ed->obj, &w, &h); eo_do(ed->obj,
evas_object_size_hint_min_set(ed->obj, w, h); edje_obj_size_min_get(&w, &h),
evas_obj_size_hint_min_set(w, h));
} }
if (!ed->collection) return ; if (!ed->collection) return ;
@ -1230,9 +1231,9 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
tw = th = 0; tw = th = 0;
if (!chosen_desc->text.min_x) if (!chosen_desc->text.min_x)
{ {
evas_object_resize(ep->object, params->w, params->h); eo_do(ep->object,
evas_object_textblock_size_formatted_get(ep->object, &tw, evas_obj_size_set(params->w, params->h),
&th); evas_obj_textblock_size_formatted_get(&tw, &th));
} }
else else
evas_object_textblock_size_native_get(ep->object, &tw, &th); evas_object_textblock_size_native_get(ep->object, &tw, &th);
@ -1257,8 +1258,9 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
tw = th = 0; tw = th = 0;
if (!chosen_desc->text.max_x) if (!chosen_desc->text.max_x)
{ {
evas_object_resize(ep->object, params->w, params->h); eo_do(ep->object,
evas_object_textblock_size_formatted_get(ep->object, &tw, &th); evas_obj_size_set(params->w, params->h),
evas_obj_textblock_size_formatted_get(&tw, &th));
} }
else else
evas_object_textblock_size_native_get(ep->object, &tw, &th); evas_object_textblock_size_native_get(ep->object, &tw, &th);
@ -1282,16 +1284,17 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
double s = 1.0; double s = 1.0;
if (ep->part->scale) s = TO_DOUBLE(sc); if (ep->part->scale) s = TO_DOUBLE(sc);
evas_object_scale_set(ep->object, s); eo_do(ep->object,
evas_object_textblock_size_formatted_get(ep->object, &tw, &th); evas_obj_scale_set(s),
evas_obj_textblock_size_formatted_get(&tw, &th));
if (chosen_desc->text.fit_x) if (chosen_desc->text.fit_x)
{ {
if ((tw > 0) && (tw > params->w)) if ((tw > 0) && (tw > params->w))
{ {
s = (s * params->w) / (double)tw; s = (s * params->w) / (double)tw;
evas_object_scale_set(ep->object, s); eo_do(ep->object,
evas_object_textblock_size_formatted_get(ep->object, evas_obj_scale_set(s),
&tw, &th); evas_obj_textblock_size_formatted_get(&tw, &th));
} }
} }
if (chosen_desc->text.fit_y) if (chosen_desc->text.fit_y)
@ -1299,9 +1302,9 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
if ((th > 0) && (th > params->h)) if ((th > 0) && (th > params->h))
{ {
s = (s * params->h) / (double)th; s = (s * params->h) / (double)th;
evas_object_scale_set(ep->object, s); eo_do(ep->object,
evas_object_textblock_size_formatted_get(ep->object, evas_obj_scale_set(s),
&tw, &th); evas_obj_textblock_size_formatted_get(&tw, &th));
} }
} }
} }
@ -1373,8 +1376,9 @@ _edje_part_recalc_single_text(FLOAT_T sc __UNUSED__,
(!chosen_desc->text.max_x) && (!chosen_desc->text.max_y))) (!chosen_desc->text.max_x) && (!chosen_desc->text.max_y)))
return; return;
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th); eo_do(ep->object,
evas_object_text_style_pad_get(ep->object, &l, &r, &t, &b); evas_obj_size_get(&tw, &th),
evas_obj_text_style_pad_get(&l, &r, &t, &b));
mw = tw + l + r; mw = tw + l + r;
mh = th + t + b; mh = th + t + b;
@ -1533,9 +1537,10 @@ _edje_part_recalc_single_text(FLOAT_T sc __UNUSED__,
[(ep->part->effect & EDJE_TEXT_EFFECT_MASK_SHADOW_DIRECTION) >> 4]; [(ep->part->effect & EDJE_TEXT_EFFECT_MASK_SHADOW_DIRECTION) >> 4];
EVAS_TEXT_STYLE_SHADOW_DIRECTION_SET(style, shadow); EVAS_TEXT_STYLE_SHADOW_DIRECTION_SET(style, shadow);
evas_object_text_style_set(ep->object, style); eo_do(ep->object,
evas_object_text_text_set(ep->object, text); evas_obj_text_style_set(style),
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th); evas_obj_text_text_set(text),
evas_obj_size_get(&tw, &th));
if (chosen_desc->text.max_x) if (chosen_desc->text.max_x)
{ {
int l, r; int l, r;
@ -2121,9 +2126,10 @@ _edje_part_recalc_single(Edje *ed,
{ {
Evas_Coord lminw = 0, lminh = 0; Evas_Coord lminw = 0, lminh = 0;
evas_object_smart_need_recalculate_set(ep->object, 1); eo_do(ep->object,
evas_object_smart_calculate(ep->object); evas_obj_smart_need_recalculate_set(1),
evas_object_size_hint_min_get(ep->object, &lminw, &lminh); evas_obj_smart_calculate(),
evas_obj_size_hint_min_get(&lminw, &lminh));
if (((Edje_Part_Description_Table *)chosen_desc)->table.min.h) if (((Edje_Part_Description_Table *)chosen_desc)->table.min.h)
{ {
if (lminw > minw) minw = lminw; if (lminw > minw) minw = lminw;
@ -2139,9 +2145,10 @@ _edje_part_recalc_single(Edje *ed,
{ {
Evas_Coord lminw = 0, lminh = 0; Evas_Coord lminw = 0, lminh = 0;
evas_object_smart_need_recalculate_set(ep->object, 1); eo_do(ep->object,
evas_object_smart_calculate(ep->object); evas_obj_smart_need_recalculate_set(1),
evas_object_size_hint_min_get(ep->object, &lminw, &lminh); evas_obj_smart_calculate(),
evas_obj_size_hint_min_get(&lminw, &lminh));
if (((Edje_Part_Description_Box *)chosen_desc)->box.min.h) if (((Edje_Part_Description_Box *)chosen_desc)->box.min.h)
{ {
if (lminw > minw) minw = lminw; if (lminw > minw) minw = lminw;
@ -2308,13 +2315,15 @@ _edje_table_recalc_apply(Edje *ed __UNUSED__,
Edje_Calc_Params *p3 __UNUSED__, Edje_Calc_Params *p3 __UNUSED__,
Edje_Part_Description_Table *chosen_desc) Edje_Part_Description_Table *chosen_desc)
{ {
evas_object_table_homogeneous_set(ep->object, chosen_desc->table.homogeneous); eo_do(ep->object,
evas_object_table_align_set(ep->object, TO_DOUBLE(chosen_desc->table.align.x), TO_DOUBLE(chosen_desc->table.align.y)); evas_obj_table_homogeneous_set(chosen_desc->table.homogeneous),
evas_object_table_padding_set(ep->object, chosen_desc->table.padding.x, chosen_desc->table.padding.y); evas_obj_table_align_set(TO_DOUBLE(chosen_desc->table.align.x), TO_DOUBLE(chosen_desc->table.align.y)),
evas_obj_table_padding_set(chosen_desc->table.padding.x, chosen_desc->table.padding.y));
if (evas_object_smart_need_recalculate_get(ep->object)) if (evas_object_smart_need_recalculate_get(ep->object))
{ {
evas_object_smart_need_recalculate_set(ep->object, 0); eo_do(ep->object,
evas_object_smart_calculate(ep->object); evas_obj_smart_need_recalculate_set(0),
evas_obj_smart_calculate());
} }
} }
@ -2372,9 +2381,10 @@ _edje_proxy_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
} }
} }
evas_object_image_fill_set(ep->object, p3->type.common.fill.x, p3->type.common.fill.y, eo_do(ep->object,
p3->type.common.fill.w, p3->type.common.fill.h); evas_obj_image_fill_set(p3->type.common.fill.x, p3->type.common.fill.y,
evas_object_image_smooth_scale_set(ep->object, p3->smooth); p3->type.common.fill.w, p3->type.common.fill.h),
evas_obj_image_smooth_scale_set(p3->smooth));
} }
static void static void
@ -2384,9 +2394,10 @@ _edje_image_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
sc = ed->scale; sc = ed->scale;
if (sc == 0.0) sc = _edje_scale; if (sc == 0.0) sc = _edje_scale;
evas_object_image_fill_set(ep->object, p3->type.common.fill.x, p3->type.common.fill.y, eo_do(ep->object,
p3->type.common.fill.w, p3->type.common.fill.h); evas_obj_image_fill_set(p3->type.common.fill.x, p3->type.common.fill.y,
evas_object_image_smooth_scale_set(ep->object, p3->smooth); p3->type.common.fill.w, p3->type.common.fill.h),
evas_obj_image_smooth_scale_set(p3->smooth));
if (chosen_desc->image.border.scale) if (chosen_desc->image.border.scale)
{ {
if (p3->type.common.spec.image.border_scale_by > FROM_DOUBLE(0.0)) if (p3->type.common.spec.image.border_scale_by > FROM_DOUBLE(0.0))
@ -3149,15 +3160,16 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
} }
else else
#endif #endif
evas_object_move(ep->object, ed->x + pf->x, ed->y + pf->y); eo_do(ep->object,
evas_object_resize(ep->object, pf->w, pf->h); evas_obj_position_set(ed->x + pf->x, ed->y + pf->y),
evas_obj_size_set(pf->w, pf->h));
if (ep->nested_smart) if (ep->nested_smart)
{ /* Move, Resize all nested parts */ { /* Move, Resize all nested parts */
/* Not really needed but will improve the bounding box evaluation done by Evas */ /* Not really needed but will improve the bounding box evaluation done by Evas */
evas_object_move(ep->nested_smart, eo_do(ep->nested_smart,
ed->x + pf->x, ed->y + pf->y); evas_obj_position_set(ed->x + pf->x, ed->y + pf->y),
evas_object_resize(ep->nested_smart, pf->w, pf->h); evas_obj_size_set(pf->w, pf->h));
} }
if (ep->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) if (ep->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
_edje_entry_real_part_configure(ep); _edje_entry_real_part_configure(ep);
@ -3225,9 +3237,10 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
// pf->color.a); // pf->color.a);
if (pf->visible) if (pf->visible)
{ {
evas_object_move(ep->typedata.swallow->swallowed_object, ed->x + pf->x, ed->y + pf->y); eo_do(ep->typedata.swallow->swallowed_object,
evas_object_resize(ep->typedata.swallow->swallowed_object, pf->w, pf->h); evas_obj_position_set(ed->x + pf->x, ed->y + pf->y),
evas_object_show(ep->typedata.swallow->swallowed_object); evas_obj_size_set(pf->w, pf->h),
evas_obj_visibility_set(EINA_TRUE));
} }
else evas_object_hide(ep->typedata.swallow->swallowed_object); else evas_object_hide(ep->typedata.swallow->swallowed_object);
mo = ep->typedata.swallow->swallowed_object; mo = ep->typedata.swallow->swallowed_object;
@ -3300,21 +3313,24 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
if (ep->nested_smart) if (ep->nested_smart)
{ /* Apply map to smart obj holding nested parts */ { /* Apply map to smart obj holding nested parts */
evas_object_map_set(ep->nested_smart, map); eo_do(ep->nested_smart,
evas_object_map_enable_set(ep->nested_smart, 1); evas_obj_map_set(map),
evas_obj_map_enable_set(1));
} }
else else
{ {
evas_object_map_set(mo, map); eo_do(mo,
evas_object_map_enable_set(mo, 1); evas_obj_map_set(map),
evas_obj_map_enable_set(1));
} }
} }
else else
{ {
if (ep->nested_smart) if (ep->nested_smart)
{ /* Cancel map of smart obj holding nested parts */ { /* Cancel map of smart obj holding nested parts */
evas_object_map_enable_set(ep->nested_smart, 0); eo_do(ep->nested_smart,
evas_object_map_set(ep->nested_smart, NULL); evas_obj_map_enable_set(0),
evas_obj_map_set(NULL));
} }
else else
{ {
@ -3322,8 +3338,9 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
if (!ep->body) if (!ep->body)
{ {
#endif #endif
evas_object_map_enable_set(mo, 0); eo_do(mo,
evas_object_map_set(mo, NULL); evas_obj_map_enable_set(0),
evas_obj_map_set(NULL));
#ifdef HAVE_EPHYSICS #ifdef HAVE_EPHYSICS
} }
#endif #endif