diff options
author | Xavi Artigas <xavierartigas@yahoo.es> | 2018-04-05 10:47:26 +0200 |
---|---|---|
committer | Cedric Bail <cedric@osg.samsung.com> | 2018-04-24 09:03:32 -0700 |
commit | 55bd097a3d5c0201c28bc0bd045cbe77aa76f5af (patch) | |
tree | 6929ab1b8bddee873305e58aed933d7039488fcf /src/lib/edje/edje_smart.c | |
parent | 7934d152dd5c185df1b89f50239d27f25c6f2b88 (diff) |
Efl.Gfx.Entity (from Efl.Gfx)
Ref https://phab.enlightenment.org/T6847
Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
Diffstat (limited to 'src/lib/edje/edje_smart.c')
-rw-r--r-- | src/lib/edje/edje_smart.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c index 3608fdc..23d9c9e 100644 --- a/src/lib/edje/edje_smart.c +++ b/src/lib/edje/edje_smart.c | |||
@@ -161,14 +161,14 @@ _efl_canvas_layout_efl_canvas_group_group_del(Eo *obj, Edje *ed) | |||
161 | } | 161 | } |
162 | 162 | ||
163 | EOLIAN static void | 163 | EOLIAN static void |
164 | _efl_canvas_layout_efl_gfx_position_set(Eo *obj, Edje *ed, Eina_Position2D pos) | 164 | _efl_canvas_layout_efl_gfx_entity_position_set(Eo *obj, Edje *ed, Eina_Position2D pos) |
165 | { | 165 | { |
166 | unsigned short i; | 166 | unsigned short i; |
167 | 167 | ||
168 | if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y)) | 168 | if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y)) |
169 | return; | 169 | return; |
170 | 170 | ||
171 | efl_gfx_position_set(efl_super(obj, MY_CLASS), pos); | 171 | efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos); |
172 | 172 | ||
173 | if ((ed->x == pos.x) && (ed->y == pos.y)) return; | 173 | if ((ed->x == pos.x) && (ed->y == pos.y)) return; |
174 | ed->x = pos.x; | 174 | ed->x = pos.x; |
@@ -264,7 +264,7 @@ _edje_limit_get(Edje *ed, Edje_Limit **limits, unsigned int length, Evas_Coord s | |||
264 | } | 264 | } |
265 | 265 | ||
266 | EOLIAN static void | 266 | EOLIAN static void |
267 | _efl_canvas_layout_efl_gfx_size_set(Eo *obj, Edje *ed, Eina_Size2D sz) | 267 | _efl_canvas_layout_efl_gfx_entity_size_set(Eo *obj, Edje *ed, Eina_Size2D sz) |
268 | { | 268 | { |
269 | if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h)) | 269 | if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h)) |
270 | return; | 270 | return; |
@@ -300,7 +300,7 @@ _efl_canvas_layout_efl_gfx_size_set(Eo *obj, Edje *ed, Eina_Size2D sz) | |||
300 | _edje_emit(ed, "resize", NULL); | 300 | _edje_emit(ed, "resize", NULL); |
301 | 301 | ||
302 | super: | 302 | super: |
303 | efl_gfx_size_set(efl_super(obj, MY_CLASS), sz); | 303 | efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz); |
304 | } | 304 | } |
305 | 305 | ||
306 | static void | 306 | static void |
@@ -309,7 +309,7 @@ _edje_object_show(Eo *obj, Edje *ed) | |||
309 | Eina_List *l; | 309 | Eina_List *l; |
310 | Edje *edg; | 310 | Edje *edg; |
311 | 311 | ||
312 | efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE); | 312 | efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE); |
313 | if (_edje_lua_script_only(ed)) | 313 | if (_edje_lua_script_only(ed)) |
314 | { | 314 | { |
315 | _edje_lua_script_only_show(ed); | 315 | _edje_lua_script_only_show(ed); |
@@ -336,7 +336,7 @@ _edje_object_hide(Eo *obj, Edje *ed) | |||
336 | Eina_List *l; | 336 | Eina_List *l; |
337 | Edje *edg; | 337 | Edje *edg; |
338 | 338 | ||
339 | efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE); | 339 | efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE); |
340 | if (_edje_lua_script_only(ed)) | 340 | if (_edje_lua_script_only(ed)) |
341 | { | 341 | { |
342 | _edje_lua_script_only_hide(ed); | 342 | _edje_lua_script_only_hide(ed); |
@@ -348,7 +348,7 @@ _edje_object_hide(Eo *obj, Edje *ed) | |||
348 | } | 348 | } |
349 | 349 | ||
350 | EOLIAN static void | 350 | EOLIAN static void |
351 | _efl_canvas_layout_efl_gfx_visible_set(Eo *obj, Edje *ed, Eina_Bool vis) | 351 | _efl_canvas_layout_efl_gfx_entity_visible_set(Eo *obj, Edje *ed, Eina_Bool vis) |
352 | { | 352 | { |
353 | if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis)) | 353 | if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis)) |
354 | return; | 354 | return; |