summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVyacheslav Reutskiy <v.reutskiy@samsung.com>2017-09-22 14:10:41 +0300
committerVyacheslav Reutskiy <v.reutskiy@samsung.com>2017-09-22 14:33:06 +0300
commit796d22455a5be8c3c537ea1d3fb64c7f40fac06c (patch)
treed2422bc51cec1d0d4b9b27cd0e29f770bbb61c79
parentf97e019c5f3e437c28a89e8a8c87564570ec6ba8 (diff)
ruler: adapt to new eo API
-rw-r--r--src/lib/ewe_ruler.c33
1 files 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)
861EOLIAN static void 861EOLIAN static void
862_ewe_ruler_efl_gfx_position_set(Eo *obj, 862_ewe_ruler_efl_gfx_position_set(Eo *obj,
863 Ewe_Ruler_Smart_Data *sd, 863 Ewe_Ruler_Smart_Data *sd,
864 Evas_Coord x, 864 Eina_Position2D pos)
865 Evas_Coord y)
866{ 865{
867 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, x, y)) 866 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
868 return; 867 return;
869 868
870 efl_gfx_position_set(efl_super(obj, MY_CLASS), x, y); 869 efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
870 evas_object_move(obj, pos.x, pos.y);
871 871
872 evas_object_move(sd->clip, x, y); 872 evas_object_move(sd->clip, pos.x, pos.y);
873 evas_object_move(sd->bg, x, y); 873 evas_object_move(sd->bg, pos.x, pos.y);
874 874
875 sd->geometry.x = x; 875 sd->geometry.x = pos.x;
876 sd->geometry.y = y; 876 sd->geometry.y = pos.y;
877 sd->position_changed = EINA_TRUE; 877 sd->position_changed = EINA_TRUE;
878 evas_object_smart_changed(obj); 878 evas_object_smart_changed(obj);
879} 879}
@@ -881,23 +881,22 @@ _ewe_ruler_efl_gfx_position_set(Eo *obj,
881EOLIAN static void 881EOLIAN static void
882_ewe_ruler_efl_gfx_size_set(Eo *obj, 882_ewe_ruler_efl_gfx_size_set(Eo *obj,
883 Ewe_Ruler_Smart_Data *sd, 883 Ewe_Ruler_Smart_Data *sd,
884 Evas_Coord w, 884 Eina_Size2D size)
885 Evas_Coord h)
886{ 885{
887 if ((w == sd->geometry.width) && (h == sd->geometry.height)) return; 886 if ((size.w == sd->geometry.width) && (size.h == sd->geometry.height)) return;
888 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, w, h)) 887 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, size.w, size.h))
889 return; 888 return;
890 889
891 sd->size_changed = EINA_TRUE; 890 sd->size_changed = EINA_TRUE;
892 sd->geometry.width = w; 891 sd->geometry.width = size.w;
893 sd->geometry.height = h; 892 sd->geometry.height = size.h;
894 893
895 evas_object_resize(sd->clip, w, h); 894 evas_object_resize(sd->clip, size.w, size.h);
896 evas_object_resize(sd->bg, w, h); 895 evas_object_resize(sd->bg, size.w, size.h);
897 896
898 evas_object_smart_changed(obj); 897 evas_object_smart_changed(obj);
899 898
900 efl_gfx_size_set(efl_super(obj, MY_CLASS), w, h); 899 efl_gfx_size_set(efl_super(obj, MY_CLASS), size);
901} 900}
902 901
903EOLIAN static void 902EOLIAN static void