evas: let's not use eo_do for potential Efl interface call.
authorCedric BAIL <cedric@osg.samsung.com>
Fri, 3 Apr 2015 14:04:58 +0000 (16:04 +0200)
committerCedric BAIL <cedric@osg.samsung.com>
Fri, 3 Apr 2015 14:04:58 +0000 (16:04 +0200)
src/lib/elm_cnp.c
src/lib/elm_scroller.c

index 1dbbc77..2de648a 100644 (file)
@@ -4159,7 +4159,8 @@ _elm_item_container_pos_cb(void *data, Evas_Object *obj, Evas_Coord x, Evas_Coor
      {  /* Call container drop func with specific item pointer */
         int xo = 0;
         int yo = 0;
-        eo_do(obj, evas_obj_position_get(&xo, &yo));
+
+        evas_object_geometry_get(obj, &xo, &yo, NULL, NULL);
         if (st->itemgetcb)
           it = st->itemgetcb(obj, x+xo, y+yo, &xposret, &yposret);
 
@@ -4181,7 +4182,8 @@ _elm_item_container_drop_cb(void *data, Evas_Object *obj , Elm_Selection_Data *e
      {  /* Call container drop func with specific item pointer */
         int xo = 0;
         int yo = 0;
-        eo_do(obj, evas_obj_position_get(&xo, &yo));
+
+        evas_object_geometry_get(obj, &xo, &yo, NULL, NULL);
         if (st->itemgetcb)
           it = st->itemgetcb(obj, ev->x+xo, ev->y+yo, &xposret, &yposret);
 
index f9825a1..a250482 100644 (file)
@@ -109,9 +109,7 @@ _key_action_move(Evas_Object *obj, const char *params)
          elm_interface_scrollable_page_size_get(&page_x, &page_y),
          elm_interface_scrollable_content_viewport_geometry_get
          (NULL, NULL, &v_w, &v_h));
-   eo_do(sd->content,
-         evas_obj_position_get(&c_x, &c_y),
-         evas_obj_size_get(&max_x, &max_y));
+   evas_object_geometry_get(sd->content, &c_x, &c_y, &max_x, &max_y);
 
    current_focus = elm_widget_focused_object_get(obj);
    evas_object_geometry_get(current_focus, &f_x, &f_y, &f_w, &f_h);