aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVyacheslav Reutskiy <v.reutskiy@samsung.com>2017-07-25 14:12:46 +0300
committerVyacheslav Reutskiy <v.reutskiy@samsung.com>2017-07-25 15:35:42 +0300
commit694ee5a7590265eed33ed986c2f95271d6bb36a7 (patch)
treed31de0c04b4afaa7c90e092fe4150b2d85bde34e
parentconfigure: bump efl dependencies and Eflete version (diff)
downloadeflete-694ee5a7590265eed33ed986c2f95271d6bb36a7.tar.gz
ewe: update eo syntax usage for ewe_ruler
-rw-r--r--src/lib/ewe_ruler.c66
-rw-r--r--src/lib/ewe_ruler.eo4
2 files changed, 1 insertions, 69 deletions
diff --git a/src/lib/ewe_ruler.c b/src/lib/ewe_ruler.c
index 95888c0dc..4476a51e9 100644
--- a/src/lib/ewe_ruler.c
+++ b/src/lib/ewe_ruler.c
@@ -782,72 +782,6 @@ _ewe_ruler_marker_style_get(Eo *obj EINA_UNUSED,
/*------------------------Smart functions ----------------------------*/
-EOLIAN static void
-_ewe_ruler_efl_canvas_group_group_add(Eo *obj, Ewe_Ruler_Smart_Data *sd)
-{
- const char *data_dir = NULL;
- Eina_Strbuf *theme_path = NULL;
-
- efl_canvas_group_add(efl_super(obj, MY_CLASS));
- elm_widget_sub_object_parent_add(obj);
-
- data_dir = elm_app_data_dir_get();
- if (data_dir && strcmp(data_dir, ""))
- {
- theme_path = eina_strbuf_new();
- eina_strbuf_append_printf(theme_path,
- "%s"EINA_PATH_SEP_S"themes"EINA_PATH_SEP_S"default"EINA_PATH_SEP_S"ewe.edj",
- data_dir);
- sd->theme_file = eina_strbuf_string_steal(theme_path);
- eina_strbuf_free(theme_path);
- }
- else
- {
- sd->theme_file = strdup(EWE_THEME);
- }
-
- sd->obj = obj;
- sd->clip = evas_object_rectangle_add(evas_object_evas_get(obj));
- evas_object_smart_member_add(sd->clip, obj);
- sd->bg = elm_layout_add(obj);
- elm_layout_file_set(sd->bg, sd->theme_file, "ewe/ruler/horizontal_background/default");
- evas_object_smart_member_add(sd->bg, obj);
-
- sd->horizontal = EINA_TRUE;
- sd->geometry.width = 0;
- sd->geometry.height = 0;
- sd->geometry.x = 0;
- sd->geometry.y = 0;
- sd->ruler_visible = EINA_FALSE;
- sd->size_changed = EINA_TRUE;
- sd->text_changed = EINA_TRUE;
- sd->position_changed = EINA_TRUE;
- ewe_ruler_scale_add(obj, NULL);
-}
-
-EOLIAN static void
-_ewe_ruler_efl_canvas_group_group_del(Eo *obj,
- Ewe_Ruler_Smart_Data *sd)
-{
- Ewe_Ruler_Scale *scale;
- Ewe_Ruler_Marker *marker;
- Eina_List *l, *ls;
-
- EINA_LIST_FOREACH_SAFE(sd->markers, l, ls, marker)
- ewe_ruler_marker_del(obj, marker);
-
- EINA_LIST_FOREACH_SAFE(sd->scales, l, ls, scale)
- ewe_ruler_scale_del(obj, scale);
-
- evas_object_smart_member_del(sd->clip);
- evas_object_del(sd->clip);
-
- evas_object_smart_member_del(sd->bg);
- evas_object_del(sd->bg);
-
- free(sd->theme_file);
-}
-
static void
_ewe_ruler_show(Eo* obj, Ewe_Ruler_Smart_Data *sd)
{
diff --git a/src/lib/ewe_ruler.eo b/src/lib/ewe_ruler.eo
index 5330afed9..a38c2b2f8 100644
--- a/src/lib/ewe_ruler.eo
+++ b/src/lib/ewe_ruler.eo
@@ -1,7 +1,7 @@
type Ewe_Ruler_Scale: __undefined_type;
type Ewe_Ruler_Marker: __undefined_type;
-class Ewe.Ruler (Elm.Widget)
+class Ewe.Ruler (Elm.Layout)
{
eo_prefix: ewe_obj_ruler;
legacy_prefix: ewe_ruler;
@@ -317,8 +317,6 @@ class Ewe.Ruler (Elm.Widget)
Efl.Gfx.size { set; }
Efl.Gfx.position { set; }
Efl.Gfx.visible { set; }
- Efl.Canvas.Group.group_add;
- Efl.Canvas.Group.group_del;
Efl.Canvas.Group.group_calculate;
Elm.Widget.theme_apply;
}