rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=796d22455a5be8c3c537ea1d3fb64c7f40fac06c
commit 796d22455a5be8c3c537ea1d3fb64c7f40fac06c
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date: Fri Sep 22 14:10:41 2017 +0300
ruler: adapt to new eo API
---
src/lib/ewe_ruler.c | 33 ++++++++++++++++-----------------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/src/lib/ewe_ruler.c b/src/lib/ewe_ruler.c
index e31abe1a6..87b08cc0f 100644
--- a/src/lib/ewe_ruler.c
+++ b/src/lib/ewe_ruler.c
@@ -861,19 +861,19 @@ _ewe_ruler_efl_gfx_visible_set(Eo *obj,
Ewe_Ruler_Smart_Data *sd, Eina_Bool vis)
EOLIAN static void
_ewe_ruler_efl_gfx_position_set(Eo *obj,
Ewe_Ruler_Smart_Data *sd,
- Evas_Coord x,
- Evas_Coord y)
+ Eina_Position2D pos)
{
- if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, x,
y))
+ if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0,
pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), x, y);
+ efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
+ evas_object_move(obj, pos.x, pos.y);
- evas_object_move(sd->clip, x, y);
- evas_object_move(sd->bg, x, y);
+ evas_object_move(sd->clip, pos.x, pos.y);
+ evas_object_move(sd->bg, pos.x, pos.y);
- sd->geometry.x = x;
- sd->geometry.y = y;
+ sd->geometry.x = pos.x;
+ sd->geometry.y = pos.y;
sd->position_changed = EINA_TRUE;
evas_object_smart_changed(obj);
}
@@ -881,23 +881,22 @@ _ewe_ruler_efl_gfx_position_set(Eo *obj,
EOLIAN static void
_ewe_ruler_efl_gfx_size_set(Eo *obj,
Ewe_Ruler_Smart_Data *sd,
- Evas_Coord w,
- Evas_Coord h)
+ Eina_Size2D size)
{
- if ((w == sd->geometry.width) && (h == sd->geometry.height)) return;
- if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, w,
h))
+ if ((size.w == sd->geometry.width) && (size.h == sd->geometry.height))
return;
+ if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0,
size.w, size.h))
return;
sd->size_changed = EINA_TRUE;
- sd->geometry.width = w;
- sd->geometry.height = h;
+ sd->geometry.width = size.w;
+ sd->geometry.height = size.h;
- evas_object_resize(sd->clip, w, h);
- evas_object_resize(sd->bg, w, h);
+ evas_object_resize(sd->clip, size.w, size.h);
+ evas_object_resize(sd->bg, size.w, size.h);
evas_object_smart_changed(obj);
- efl_gfx_size_set(efl_super(obj, MY_CLASS), w, h);
+ efl_gfx_size_set(efl_super(obj, MY_CLASS), size);
}
EOLIAN static void
--
