diff options
author | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-09-15 12:14:32 +0900 |
---|---|---|
committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-09-18 13:22:54 +0900 |
commit | 8fb194d969ccb9227e56ea60f538d977393408d7 (patch) | |
tree | 0673442275d29108e58a4cb0ab9fc0946db91b59 /src/lib/edje/edje_calc.c | |
parent | f3eff6eb3ee6e9b56c0be5cd7f8905f14b388e4f (diff) |
efl: Use Eina.Position2D for Efl.Gfx.position
Note: This is a little bit more cumbersome in some places but in most
it's more convenient than (x,y).
Diffstat (limited to '')
-rw-r--r-- | src/lib/edje/edje_calc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index 54aca19613..b5020c9cf7 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c | |||
@@ -5264,15 +5264,15 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta | |||
5264 | } | 5264 | } |
5265 | } | 5265 | } |
5266 | else | 5266 | else |
5267 | efl_gfx_position_set(ep->object, ed->x + pf->final.x, ed->y + pf->final.y); | 5267 | efl_gfx_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)); |
5268 | #else | 5268 | #else |
5269 | efl_gfx_position_set(ep->object, ed->x + pf->final.x, ed->y + pf->final.y); | 5269 | efl_gfx_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)); |
5270 | efl_gfx_size_set(ep->object, pf->final.w, pf->final.h); | 5270 | efl_gfx_size_set(ep->object, pf->final.w, pf->final.h); |
5271 | #endif | 5271 | #endif |
5272 | 5272 | ||
5273 | if (ep->nested_smart) /* Move, Resize all nested parts */ | 5273 | if (ep->nested_smart) /* Move, Resize all nested parts */ |
5274 | { /* Not really needed but will improve the bounding box evaluation done by Evas */ | 5274 | { /* Not really needed but will improve the bounding box evaluation done by Evas */ |
5275 | efl_gfx_position_set(ep->nested_smart, ed->x + pf->final.x, ed->y + pf->final.y); | 5275 | efl_gfx_position_set(ep->nested_smart, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)); |
5276 | efl_gfx_size_set(ep->nested_smart, pf->final.w, pf->final.h); | 5276 | efl_gfx_size_set(ep->nested_smart, pf->final.w, pf->final.h); |
5277 | } | 5277 | } |
5278 | if (ep->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) | 5278 | if (ep->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) |
@@ -5312,7 +5312,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta | |||
5312 | 5312 | ||
5313 | pd_camera = (Edje_Part_Description_Camera*) ep->chosen_description; | 5313 | pd_camera = (Edje_Part_Description_Camera*) ep->chosen_description; |
5314 | 5314 | ||
5315 | efl_gfx_position_set(ep->object, ed->x + pf->final.x, ed->y + pf->final.y), | 5315 | efl_gfx_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)), |
5316 | efl_gfx_size_set(ep->object, pf->final.w, pf->final.h); | 5316 | efl_gfx_size_set(ep->object, pf->final.w, pf->final.h); |
5317 | 5317 | ||
5318 | viewport = evas_object_image_source_get(ep->object); | 5318 | viewport = evas_object_image_source_get(ep->object); |
@@ -5563,7 +5563,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta | |||
5563 | 5563 | ||
5564 | if (ep->part->type == EDJE_PART_TYPE_GROUP) | 5564 | if (ep->part->type == EDJE_PART_TYPE_GROUP) |
5565 | vis = evas_object_visible_get(ed->obj); | 5565 | vis = evas_object_visible_get(ed->obj); |
5566 | efl_gfx_position_set(ep->typedata.swallow->swallowed_object, ed->x + pf->final.x, ed->y + pf->final.y); | 5566 | efl_gfx_position_set(ep->typedata.swallow->swallowed_object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)); |
5567 | efl_gfx_size_set(ep->typedata.swallow->swallowed_object, pf->final.w, pf->final.h); | 5567 | efl_gfx_size_set(ep->typedata.swallow->swallowed_object, pf->final.w, pf->final.h); |
5568 | efl_gfx_visible_set(ep->typedata.swallow->swallowed_object, vis); | 5568 | efl_gfx_visible_set(ep->typedata.swallow->swallowed_object, vis); |
5569 | } | 5569 | } |