[EGIT] [tools/enventor] master 01/01: Fix eo compilation.
jaehyun pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=af4a2e276b5a00f74b74a6eb11cbe4b2f54c0c37 commit af4a2e276b5a00f74b74a6eb11cbe4b2f54c0c37 Author: Jaehyun ChoDate: Wed Oct 19 18:38:54 2016 +0900 Fix eo compilation. This commit fixes 5dad0ee30468c7cd70d43bce7ffad3d148fb5843 --- src/lib/enventor_smart.c | 8 1 file changed, 8 insertions(+) diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c index e34542c..d33cf88 100644 --- a/src/lib/enventor_smart.c +++ b/src/lib/enventor_smart.c @@ -331,6 +331,8 @@ _enventor_object_efl_canvas_group_group_member_add(Eo *obj, Enventor_Object_Data EOLIAN static void _enventor_object_efl_gfx_position_set(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Coord x, Evas_Coord y) { + efl_gfx_position_set(efl_super(obj, MY_CLASS), x, y); + Eina_Iterator *it = evas_object_smart_iterator_new(obj); Evas_Object *o; EINA_ITERATOR_FOREACH(it, o) @@ -341,6 +343,8 @@ _enventor_object_efl_gfx_position_set(Eo *obj, Enventor_Object_Data *pd EINA_UNU EOLIAN static void _enventor_object_efl_gfx_size_set(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Coord w, Evas_Coord h) { + efl_gfx_size_set(efl_super(obj, MY_CLASS), w, h); + Eina_Iterator *it = evas_object_smart_iterator_new(obj); Evas_Object *o; EINA_ITERATOR_FOREACH(it, o) @@ -351,6 +355,8 @@ _enventor_object_efl_gfx_size_set(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, EOLIAN static void _enventor_object_efl_gfx_visible_set(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd, Eina_Bool vis) { + efl_gfx_visible_set(efl_super(obj, MY_CLASS), vis); + if (!pd->focused_it) return; Evas_Object *o = edit_obj_get(pd->focused_it->ed); if (vis) @@ -362,6 +368,8 @@ _enventor_object_efl_gfx_visible_set(Eo *obj EINA_UNUSED, Enventor_Object_Data * EOLIAN static void _enventor_object_efl_canvas_object_clip_set(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Object *clip) { + efl_canvas_object_clip_set(efl_super(obj, MY_CLASS), clip); + Eina_Iterator *it = evas_object_smart_iterator_new(obj); Evas_Object *o; EINA_ITERATOR_FOREACH(it, o) --
[EGIT] [tools/enventor] master 01/01: Fix eo compilation.
jaehyun pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=5dad0ee30468c7cd70d43bce7ffad3d148fb5843 commit 5dad0ee30468c7cd70d43bce7ffad3d148fb5843 Author: Jaehyun ChoDate: Wed Oct 19 18:17:34 2016 +0900 Fix eo compilation. This commit applies the following efl commits. evas: Mark group_add/del as internal evas/elm: Remove function group_move evas/elm: Remove function group_move evas/elm: Remove group_show and group_hide evas: Move clip_unset to legacy, remove group_clip --- src/lib/enventor_object.eo | 10 -- src/lib/enventor_smart.c | 33 ++--- 2 files changed, 14 insertions(+), 29 deletions(-) diff --git a/src/lib/enventor_object.eo b/src/lib/enventor_object.eo index 8199215..3e21afb 100644 --- a/src/lib/enventor_object.eo +++ b/src/lib/enventor_object.eo @@ -213,14 +213,12 @@ class Enventor.Object (Elm.Widget, Efl.File) { implements { class.constructor; Efl.Object.constructor; + Efl.Gfx.visible.set; + Efl.Gfx.position.set; + Efl.Gfx.size.set; + Efl.Canvas.Object.clip.set; Efl.Canvas.Group.group_add; Efl.Canvas.Group.group_del; - Efl.Canvas.Group.group_move; - Efl.Canvas.Group.group_resize; - Efl.Canvas.Group.group_show; - Efl.Canvas.Group.group_hide; - Efl.Canvas.Group.group_clip.set; - Efl.Canvas.Group.group_clip_unset; Efl.Canvas.Group.group_member_add; Efl.File.file.set; } diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c index 414f3b3..e34542c 100644 --- a/src/lib/enventor_smart.c +++ b/src/lib/enventor_smart.c @@ -4,6 +4,8 @@ #define ELM_INTERNAL_API_ARGESFSDFEFC 1 #define EFL_CANVAS_OBJECT_PROTECTED 1 +#define EFL_CANVAS_GROUP_PROTECTED +#define EFL_CANVAS_GROUP_BETA #include #include @@ -327,7 +329,7 @@ _enventor_object_efl_canvas_group_group_member_add(Eo *obj, Enventor_Object_Data } EOLIAN static void -_enventor_object_efl_canvas_group_group_move(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Coord x, Evas_Coord y) +_enventor_object_efl_gfx_position_set(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Coord x, Evas_Coord y) { Eina_Iterator *it = evas_object_smart_iterator_new(obj); Evas_Object *o; @@ -337,7 +339,7 @@ _enventor_object_efl_canvas_group_group_move(Eo *obj, Enventor_Object_Data *pd E } EOLIAN static void -_enventor_object_efl_canvas_group_group_resize(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Coord w, Evas_Coord h) +_enventor_object_efl_gfx_size_set(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Coord w, Evas_Coord h) { Eina_Iterator *it = evas_object_smart_iterator_new(obj); Evas_Object *o; @@ -347,23 +349,18 @@ _enventor_object_efl_canvas_group_group_resize(Eo *obj, Enventor_Object_Data *pd } EOLIAN static void -_enventor_object_efl_canvas_group_group_show(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd) +_enventor_object_efl_gfx_visible_set(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd, Eina_Bool vis) { if (!pd->focused_it) return; Evas_Object *o = edit_obj_get(pd->focused_it->ed); - evas_object_show(o); -} - -EOLIAN static void -_enventor_object_efl_canvas_group_group_hide(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd) -{ - if (!pd->focused_it) return; - Evas_Object *o = edit_obj_get(pd->focused_it->ed); - evas_object_hide(o); + if (vis) + evas_object_show(o); + else + evas_object_hide(o); } EOLIAN static void -_enventor_object_efl_canvas_group_group_clip_set(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Object *clip) +_enventor_object_efl_canvas_object_clip_set(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Object *clip) { Eina_Iterator *it = evas_object_smart_iterator_new(obj); Evas_Object *o; @@ -372,16 +369,6 @@ _enventor_object_efl_canvas_group_group_clip_set(Eo *obj, Enventor_Object_Data * eina_iterator_free(it); } -EOLIAN static void -_enventor_object_efl_canvas_group_group_clip_unset(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED) -{ - Eina_Iterator *it = evas_object_smart_iterator_new(obj); - Evas_Object *o; - EINA_ITERATOR_FOREACH(it, o) - evas_object_clip_unset(o); - eina_iterator_free(it); -} - EOLIAN static Eo * _enventor_object_efl_object_constructor(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED) --
[EGIT] [tools/enventor] master 01/01: Fix eo compilation.
jaehyun pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=9e98077d300aa721a918ec91ff87a8616723a752 commit 9e98077d300aa721a918ec91ff87a8616723a752 Author: Jaehyun ChoDate: Sun Jun 19 12:44:09 2016 +0900 Fix eo compilation. This commit applies the following efl commits. Evas: Move smart_callbacks_descriptions to legacy Evas: Rename smart object into Efl.Canvas.Group --- src/lib/enventor_object.eo | 18 +- src/lib/enventor_smart.c | 25 - 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/lib/enventor_object.eo b/src/lib/enventor_object.eo index c3b582c..aeb9775 100644 --- a/src/lib/enventor_object.eo +++ b/src/lib/enventor_object.eo @@ -297,15 +297,15 @@ class Enventor.Object (Elm.Widget, Efl.File) { implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; - Evas.Object.Smart.move; - Evas.Object.Smart.resize; - Evas.Object.Smart.show; - Evas.Object.Smart.hide; - Evas.Object.Smart.clip.set; - Evas.Object.Smart.clip_unset; - Evas.Object.Smart.member_add; + Efl.Canvas.Group.group_add; + Efl.Canvas.Group.group_del; + Efl.Canvas.Group.group_move; + Efl.Canvas.Group.group_resize; + Efl.Canvas.Group.group_show; + Efl.Canvas.Group.group_hide; + Efl.Canvas.Group.group_clip.set; + Efl.Canvas.Group.group_clip_unset; + Efl.Canvas.Group.group_member_add; Efl.File.file.set; } events { diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c index 2f29329..e947467 100644 --- a/src/lib/enventor_smart.c +++ b/src/lib/enventor_smart.c @@ -223,12 +223,12 @@ _enventor_object_class_constructor(Eo_Class *klass) } EOLIAN static void -_enventor_object_evas_object_smart_add(Eo *obj, Enventor_Object_Data *pd) +_enventor_object_efl_canvas_group_group_add(Eo *obj, Enventor_Object_Data *pd) { pd->obj = obj; elm_widget_sub_object_parent_add(obj); - evas_obj_smart_add(eo_super(obj, MY_CLASS)); + efl_canvas_group_add(eo_super(obj, MY_CLASS)); build_init(); autocomp_init(); @@ -254,8 +254,7 @@ _enventor_object_evas_object_smart_add(Eo *obj, Enventor_Object_Data *pd) } EOLIAN static void -_enventor_object_evas_object_smart_del(Evas_Object *obj EINA_UNUSED, - Enventor_Object_Data *pd) +_enventor_object_efl_canvas_group_group_del(Evas_Object *obj EINA_UNUSED, Enventor_Object_Data *pd) { eina_stringshare_del(pd->font_name); eina_stringshare_del(pd->font_style); @@ -270,9 +269,9 @@ _enventor_object_evas_object_smart_del(Evas_Object *obj EINA_UNUSED, } EOLIAN static void -_enventor_object_evas_object_smart_member_add(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Object *child) +_enventor_object_efl_canvas_group_group_member_add(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Object *child) { - evas_obj_smart_member_add(eo_super(obj, MY_CLASS), child); + efl_canvas_group_member_add(eo_super(obj, MY_CLASS), child); if (evas_object_visible_get(obj)) evas_object_show(child); else evas_object_hide(child); @@ -286,7 +285,7 @@ _enventor_object_evas_object_smart_member_add(Eo *obj, Enventor_Object_Data *pd } EOLIAN static void -_enventor_object_evas_object_smart_move(Evas_Object *obj EINA_UNUSED, Enventor_Object_Data *pd, Evas_Coord x, Evas_Coord y) +_enventor_object_efl_canvas_group_group_move(Evas_Object *obj EINA_UNUSED, Enventor_Object_Data *pd, Evas_Coord x, Evas_Coord y) { //Main Item Evas_Object *o = edit_obj_get(pd->main_it.ed); @@ -294,7 +293,7 @@ _enventor_object_evas_object_smart_move(Evas_Object *obj EINA_UNUSED, Enventor_O } EOLIAN static void -_enventor_object_evas_object_smart_resize(Evas_Object *obj EINA_UNUSED, Enventor_Object_Data *pd, Evas_Coord w, Evas_Coord h) +_enventor_object_efl_canvas_group_group_resize(Evas_Object *obj EINA_UNUSED, Enventor_Object_Data *pd, Evas_Coord w, Evas_Coord h) { //Main Item Evas_Object *o = edit_obj_get(pd->main_it.ed); @@ -302,7 +301,7 @@ _enventor_object_evas_object_smart_resize(Evas_Object *obj EINA_UNUSED, Enventor } EOLIAN static void -_enventor_object_evas_object_smart_show(Evas_Object *obj EINA_UNUSED, Enventor_Object_Data *pd) +_enventor_object_efl_canvas_group_group_show(Evas_Object *obj EINA_UNUSED, Enventor_Object_Data *pd) { //Main Item Evas_Object *o = edit_obj_get(pd->main_it.ed); @@ -310,7 +309,7 @@ _enventor_object_evas_object_smart_show(Evas_Object *obj EINA_UNUSED, Enventor_O } EOLIAN static void -_enventor_object_evas_object_smart_hide(Evas_Object *obj EINA_UNUSED, Enventor_Object_Data *pd) +_enventor_object_efl_canvas_group_group_hide(Evas_Object *obj EINA_UNUSED, Enventor_Object_Data *pd) { //Main Item Evas_Object *o = edit_obj_get(pd->main_it.ed); @@ -318,7 +317,7 @@
[EGIT] [tools/enventor] master 01/01: fix eo compilation.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=c77cfc64992cfe07c32c81bdd6a24502ab4f7cd1 commit c77cfc64992cfe07c32c81bdd6a24502ab4f7cd1 Author: Hermet ParkDate: Tue May 24 11:57:11 2016 +0900 fix eo compilation. Still eo syntax is unstable, enventor keeps updating its usage. --- src/lib/enventor_object.eo | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/enventor_object.eo b/src/lib/enventor_object.eo index 19f1434..6e69b9c 100644 --- a/src/lib/enventor_object.eo +++ b/src/lib/enventor_object.eo @@ -119,26 +119,26 @@ class Enventor.Object (Elm.Widget, Efl.File) { return: bool; params { @in type: Enventor_Path_Type; -@in pathes: own(const(list)*); +@in pathes: own(const(list )); } } path_get { - return: const(list) *; + return: const(list ); params { @in type: Enventor_Path_Type; } } programs_list_get { - return: list *; + return: list; } part_states_list_get { - return: list *; + return: list; params { @in type: const(char) *; } } parts_list_get { - return: list *; + return: list; } max_line_get { return: int; @@ -179,7 +179,7 @@ class Enventor.Object (Elm.Widget, Efl.File) { } } live_view_get { - return: Evas.Object*; + return: Evas.Object; } line_goto { params { --