summaryrefslogtreecommitdiff
path: root/src/lib/edje/edje_calc.c
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2018-04-05 10:47:26 +0200
committerCedric Bail <cedric@osg.samsung.com>2018-04-24 09:03:32 -0700
commit55bd097a3d5c0201c28bc0bd045cbe77aa76f5af (patch)
tree6929ab1b8bddee873305e58aed933d7039488fcf /src/lib/edje/edje_calc.c
parent7934d152dd5c185df1b89f50239d27f25c6f2b88 (diff)
Efl.Gfx.Entity (from Efl.Gfx)
Ref https://phab.enlightenment.org/T6847 Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
Diffstat (limited to '')
-rw-r--r--src/lib/edje/edje_calc.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 5e63913df3..a64a048d60 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -1548,7 +1548,7 @@ _edje_part_recalc_single_text(FLOAT_T sc EINA_UNUSED,
1548 return; 1548 return;
1549 1549
1550 // Note: No need to add padding to that, it's already in the geometry 1550 // Note: No need to add padding to that, it's already in the geometry
1551 sz = efl_gfx_size_get(ep->object); 1551 sz = efl_gfx_entity_size_get(ep->object);
1552 mw = sz.w; 1552 mw = sz.w;
1553 mh = sz.h; 1553 mh = sz.h;
1554 1554
@@ -1716,7 +1716,7 @@ _edje_part_recalc_single_text(FLOAT_T sc EINA_UNUSED,
1716 1716
1717 evas_obj_text_style_set(ep->object, style); 1717 evas_obj_text_style_set(ep->object, style);
1718 evas_obj_text_set(ep->object, text); 1718 evas_obj_text_set(ep->object, text);
1719 ts = efl_gfx_size_get(ep->object); 1719 ts = efl_gfx_entity_size_get(ep->object);
1720 if (chosen_desc->text.max_x) 1720 if (chosen_desc->text.max_x)
1721 { 1721 {
1722 int l, r; 1722 int l, r;
@@ -4702,7 +4702,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
4702 case EDJE_PART_TYPE_EXTERNAL: 4702 case EDJE_PART_TYPE_EXTERNAL:
4703 /* visibility and color have no meaning on SWALLOW and GROUP part. */ 4703 /* visibility and color have no meaning on SWALLOW and GROUP part. */
4704#ifdef HAVE_EPHYSICS 4704#ifdef HAVE_EPHYSICS
4705 efl_gfx_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h)); 4705 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h));
4706 if ((ep->part->physics_body) && (!ep->body)) 4706 if ((ep->part->physics_body) && (!ep->body))
4707 { 4707 {
4708 if (_edje_physics_world_geometry_check(ed->world)) 4708 if (_edje_physics_world_geometry_check(ed->world))
@@ -4722,16 +4722,16 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
4722 } 4722 }
4723 } 4723 }
4724 else 4724 else
4725 efl_gfx_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)); 4725 efl_gfx_entity_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y));
4726#else 4726#else
4727 efl_gfx_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)); 4727 efl_gfx_entity_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y));
4728 efl_gfx_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h)); 4728 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h));
4729#endif 4729#endif
4730 4730
4731 if (ep->nested_smart) /* Move, Resize all nested parts */ 4731 if (ep->nested_smart) /* Move, Resize all nested parts */
4732 { /* Not really needed but will improve the bounding box evaluation done by Evas */ 4732 { /* Not really needed but will improve the bounding box evaluation done by Evas */
4733 efl_gfx_position_set(ep->nested_smart, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)); 4733 efl_gfx_entity_position_set(ep->nested_smart, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y));
4734 efl_gfx_size_set(ep->nested_smart, EINA_SIZE2D(pf->final.w, pf->final.h)); 4734 efl_gfx_entity_size_set(ep->nested_smart, EINA_SIZE2D(pf->final.w, pf->final.h));
4735 } 4735 }
4736 if (ep->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 4736 if (ep->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
4737 _edje_entry_real_part_configure(ed, ep); 4737 _edje_entry_real_part_configure(ed, ep);
@@ -4766,16 +4766,16 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
4766 Evas_Canvas3D_Camera *camera = NULL; 4766 Evas_Canvas3D_Camera *camera = NULL;
4767 Edje_Part_Description_Camera *pd_camera; 4767 Edje_Part_Description_Camera *pd_camera;
4768 4768
4769 efl_gfx_size_set(ep->object, EINA_SIZE2D(pf->req.w, pf->req.h)); 4769 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(pf->req.w, pf->req.h));
4770 4770
4771 pd_camera = (Edje_Part_Description_Camera*) ep->chosen_description; 4771 pd_camera = (Edje_Part_Description_Camera*) ep->chosen_description;
4772 4772
4773 efl_gfx_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)), 4773 efl_gfx_entity_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)),
4774 efl_gfx_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h)); 4774 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h));
4775 4775
4776 viewport = evas_object_image_source_get(ep->object); 4776 viewport = evas_object_image_source_get(ep->object);
4777 4777
4778 efl_gfx_size_set(viewport, EINA_SIZE2D(pf->req.w, pf->req.h)); 4778 efl_gfx_entity_size_set(viewport, EINA_SIZE2D(pf->req.w, pf->req.h));
4779 4779
4780 evas_object_image_source_visible_set(ep->object, EINA_FALSE); 4780 evas_object_image_source_visible_set(ep->object, EINA_FALSE);
4781 evas_object_image_source_events_set(ep->object, EINA_TRUE); 4781 evas_object_image_source_events_set(ep->object, EINA_TRUE);
@@ -5021,9 +5021,9 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
5021 5021
5022 if (ep->part->type == EDJE_PART_TYPE_GROUP) 5022 if (ep->part->type == EDJE_PART_TYPE_GROUP)
5023 vis = evas_object_visible_get(ed->obj); 5023 vis = evas_object_visible_get(ed->obj);
5024 efl_gfx_position_set(ep->typedata.swallow->swallowed_object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)); 5024 efl_gfx_entity_position_set(ep->typedata.swallow->swallowed_object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y));
5025 efl_gfx_size_set(ep->typedata.swallow->swallowed_object, EINA_SIZE2D(pf->final.w, pf->final.h)); 5025 efl_gfx_entity_size_set(ep->typedata.swallow->swallowed_object, EINA_SIZE2D(pf->final.w, pf->final.h));
5026 efl_gfx_visible_set(ep->typedata.swallow->swallowed_object, vis); 5026 efl_gfx_entity_visible_set(ep->typedata.swallow->swallowed_object, vis);
5027 } 5027 }
5028 else evas_object_hide(ep->typedata.swallow->swallowed_object); 5028 else evas_object_hide(ep->typedata.swallow->swallowed_object);
5029 mo = ep->typedata.swallow->swallowed_object; 5029 mo = ep->typedata.swallow->swallowed_object;