rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=497e62fa7fa097e9a157951db64f07ee6fd74497
commit 497e62fa7fa097e9a157951db64f07ee6fd74497 Author: Andrii Kroitor <[email protected]> Date: Fri Jun 17 14:27:05 2016 +0300 ewe: update according to changes in efl follow the white rabbit --- src/lib/ewe_combobox.c | 25 ++++++++++++------------- src/lib/ewe_combobox.eo | 12 ++++++------ src/lib/ewe_ruler.c | 25 ++++++++++++------------- src/lib/ewe_ruler.eo | 14 +++++++------- 4 files changed, 37 insertions(+), 39 deletions(-) diff --git a/src/lib/ewe_combobox.c b/src/lib/ewe_combobox.c index 49100c2..f77e5de 100644 --- a/src/lib/ewe_combobox.c +++ b/src/lib/ewe_combobox.c @@ -445,11 +445,11 @@ _ewe_combobox_content_set(Eo *obj EINA_UNUSED, /*------------------------Smart functions ----------------------------*/ EOLIAN static void -_ewe_combobox_evas_object_smart_add(Eo *obj, Ewe_Combobox_Smart_Data *sd) +_ewe_combobox_efl_canvas_group_group_add(Eo *obj, Ewe_Combobox_Smart_Data *sd) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - evas_obj_smart_add(eo_super(obj, MY_CLASS)); + efl_canvas_group_add(eo_super(obj, MY_CLASS)); elm_widget_sub_object_parent_add(obj); elm_widget_can_focus_set(obj, EINA_TRUE); @@ -465,7 +465,7 @@ _ewe_combobox_evas_object_smart_add(Eo *obj, Ewe_Combobox_Smart_Data *sd) } EOLIAN static void -_ewe_combobox_evas_object_smart_del(Eo *obj EINA_UNUSED, +_ewe_combobox_efl_canvas_group_group_del(Eo *obj EINA_UNUSED, Ewe_Combobox_Smart_Data *sd) { Ewe_Combobox_Item *it; @@ -477,18 +477,18 @@ _ewe_combobox_evas_object_smart_del(Eo *obj EINA_UNUSED, } EOLIAN static void -_ewe_combobox_evas_object_smart_show(Eo *obj EINA_UNUSED, +_ewe_combobox_efl_canvas_group_group_show(Eo *obj EINA_UNUSED, Ewe_Combobox_Smart_Data *sd) { - evas_obj_smart_show(eo_super(obj, MY_CLASS)); + efl_canvas_group_show(eo_super(obj, MY_CLASS)); evas_object_show(sd->combobox); } EOLIAN static void -_ewe_combobox_evas_object_smart_hide(Eo *obj EINA_UNUSED, +_ewe_combobox_efl_canvas_group_group_hide(Eo *obj EINA_UNUSED, Ewe_Combobox_Smart_Data *sd) { - evas_obj_smart_hide(eo_super(obj, MY_CLASS)); + efl_canvas_group_hide(eo_super(obj, MY_CLASS)); evas_object_hide(sd->combobox); } @@ -501,24 +501,24 @@ ewe_combobox_add(Evas_Object *parent) } EOLIAN static void -_ewe_combobox_evas_object_smart_move(Eo *obj, +_ewe_combobox_efl_canvas_group_group_move(Eo *obj, Ewe_Combobox_Smart_Data *sd, Evas_Coord x, Evas_Coord y) { - evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); + efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y); evas_object_move(sd->combobox, x, y); } EOLIAN static void -_ewe_combobox_evas_object_smart_resize(Eo *obj, +_ewe_combobox_efl_canvas_group_group_resize(Eo *obj, Ewe_Combobox_Smart_Data *sd, Evas_Coord w, Evas_Coord h EINA_UNUSED) { int height = 0; edje_object_size_max_get(sd->combobox, NULL, &height); - evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, height); + efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, height); evas_object_resize(sd->combobox, w, height); } @@ -529,8 +529,7 @@ _ewe_combobox_eo_base_constructor(Eo *obj, Ewe_Combobox_Smart_Data *sd) { obj = eo_constructor(eo_super(obj, MY_CLASS)); sd->obj = obj; - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY), - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); return obj; } diff --git a/src/lib/ewe_combobox.eo b/src/lib/ewe_combobox.eo index c868ae2..af8dceb 100644 --- a/src/lib/ewe_combobox.eo +++ b/src/lib/ewe_combobox.eo @@ -126,12 +126,12 @@ class Ewe.Combobox (Elm.Widget) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.del; - Evas.Object.Smart.add; - Evas.Object.Smart.resize; - Evas.Object.Smart.move; - Evas.Object.Smart.show; - Evas.Object.Smart.hide; + Efl.Canvas.Group.group_del; + Efl.Canvas.Group.group_add; + Efl.Canvas.Group.group_resize; + Efl.Canvas.Group.group_move; + Efl.Canvas.Group.group_show; + Efl.Canvas.Group.group_hide; Elm.Widget.disable; } events { diff --git a/src/lib/ewe_ruler.c b/src/lib/ewe_ruler.c index 8737a96..aad4068 100644 --- a/src/lib/ewe_ruler.c +++ b/src/lib/ewe_ruler.c @@ -725,9 +725,9 @@ _ewe_ruler_marker_style_get(Eo *obj EINA_UNUSED, /*------------------------Smart functions ----------------------------*/ EOLIAN static void -_ewe_ruler_evas_object_smart_add(Eo *obj, Ewe_Ruler_Smart_Data *sd) +_ewe_ruler_efl_canvas_group_group_add(Eo *obj, Ewe_Ruler_Smart_Data *sd) { - evas_obj_smart_add(eo_super(obj, MY_CLASS)); + efl_canvas_group_add(eo_super(obj, MY_CLASS)); elm_widget_sub_object_parent_add(obj); sd->obj = obj; @@ -750,7 +750,7 @@ _ewe_ruler_evas_object_smart_add(Eo *obj, Ewe_Ruler_Smart_Data *sd) } EOLIAN static void -_ewe_ruler_evas_object_smart_del(Eo *obj, +_ewe_ruler_efl_canvas_group_group_del(Eo *obj, Ewe_Ruler_Smart_Data *sd) { Ewe_Ruler_Scale *scale; @@ -771,7 +771,7 @@ _ewe_ruler_evas_object_smart_del(Eo *obj, } EOLIAN static void -_ewe_ruler_evas_object_smart_show(Eo* obj EINA_UNUSED, Ewe_Ruler_Smart_Data *sd) +_ewe_ruler_efl_canvas_group_group_show(Eo* obj EINA_UNUSED, Ewe_Ruler_Smart_Data *sd) { if (sd->ruler_visible) return; Ewe_Ruler_Scale *scale; @@ -806,10 +806,10 @@ _ewe_ruler_evas_object_smart_show(Eo* obj EINA_UNUSED, Ewe_Ruler_Smart_Data *sd) } EOLIAN static void -_ewe_ruler_evas_object_smart_hide(Eo* obj, Ewe_Ruler_Smart_Data *sd) +_ewe_ruler_efl_canvas_group_group_hide(Eo* obj, Ewe_Ruler_Smart_Data *sd) { if (!sd->ruler_visible) return; - evas_obj_smart_hide(eo_super(obj, MY_CLASS)); + efl_canvas_group_hide(eo_super(obj, MY_CLASS)); Ewe_Ruler_Scale *scale; Ewe_Ruler_Marker *marker; Eina_List *ls, *l; @@ -832,13 +832,13 @@ _ewe_ruler_evas_object_smart_hide(Eo* obj, Ewe_Ruler_Smart_Data *sd) } EOLIAN static void -_ewe_ruler_evas_object_smart_move(Eo *obj, +_ewe_ruler_efl_canvas_group_group_move(Eo *obj, Ewe_Ruler_Smart_Data *sd, Evas_Coord x, Evas_Coord y) { - evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); + efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y); evas_object_move(sd->clip, x, y); evas_object_move(sd->bg, x, y); @@ -850,7 +850,7 @@ _ewe_ruler_evas_object_smart_move(Eo *obj, } EOLIAN static void -_ewe_ruler_evas_object_smart_resize(Eo *obj, +_ewe_ruler_efl_canvas_group_group_resize(Eo *obj, Ewe_Ruler_Smart_Data *sd, Evas_Coord w, Evas_Coord h) @@ -861,7 +861,7 @@ _ewe_ruler_evas_object_smart_resize(Eo *obj, sd->geometry.width = w; sd->geometry.height = h; - evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); + efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h); evas_object_resize(sd->clip, w, h); evas_object_resize(sd->bg, w, h); @@ -869,7 +869,7 @@ _ewe_ruler_evas_object_smart_resize(Eo *obj, } EOLIAN static void -_ewe_ruler_evas_object_smart_calculate(Eo *obj EINA_UNUSED, +_ewe_ruler_efl_canvas_group_group_calculate(Eo *obj EINA_UNUSED, Ewe_Ruler_Smart_Data *sd) { Eina_List *ls; @@ -960,8 +960,7 @@ _ewe_ruler_eo_base_constructor(Eo *obj, Ewe_Ruler_Smart_Data *sd) { obj = eo_constructor(eo_super(obj, MY_CLASS)); sd->obj = obj; - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); return obj; } diff --git a/src/lib/ewe_ruler.eo b/src/lib/ewe_ruler.eo index bc9dd77..f383153 100644 --- a/src/lib/ewe_ruler.eo +++ b/src/lib/ewe_ruler.eo @@ -265,13 +265,13 @@ class Ewe.Ruler (Elm.Widget) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; - Evas.Object.Smart.resize; - Evas.Object.Smart.calculate; - Evas.Object.Smart.move; - Evas.Object.Smart.show; - Evas.Object.Smart.hide; + Efl.Canvas.Group.group_add; + Efl.Canvas.Group.group_del; + Efl.Canvas.Group.group_resize; + Efl.Canvas.Group.group_calculate; + Efl.Canvas.Group.group_move; + Efl.Canvas.Group.group_show; + Efl.Canvas.Group.group_hide; Elm.Widget.theme_apply; } events { --
