elementary/scroller - patched by jae.hwan.kim@samsung.com

fix two bugs - use elm_smart_scroller_edje_object_get in case of edje object

fix conditional statement when parameter is 0 in
elm_smart_scroller_page_show,

elm_smart_scroller_page_bring_in

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@64010 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index 562d90a..a665b5c 100644 (file)
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -127,12 +127,12 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
    if (!wd) return;
    if (elm_widget_focus_get(obj))
      {
-        edje_object_signal_emit(wd->scr, "elm,action,focus", "elm");
+        edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr), "elm,action,focus", "elm");
         evas_object_focus_set(wd->scr, EINA_TRUE);
      }
    else
      {
-        edje_object_signal_emit(wd->scr, "elm,action,unfocus", "elm");
+        edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr), "elm,action,unfocus", "elm");
         evas_object_focus_set(wd->scr, EINA_FALSE);
      }
 }
@@ -526,7 +526,7 @@ elm_scroller_content_unset(Evas_Object *obj)
    if (!wd->content) return NULL;
    content = wd->content;
    elm_widget_sub_object_del(obj, wd->content);
-   edje_object_part_unswallow(wd->scr, wd->content);
+   edje_object_part_unswallow(elm_smart_scroller_edje_object_get(wd->scr), wd->content);
    wd->content = NULL;
    return content;
 }

diff --git a/src/lib/els_scroller.c b/src/lib/els_scroller.c
index 9f61d29..eed8d20 100644 (file)
--- a/src/lib/els_scroller.c
+++ b/src/lib/els_scroller.c
@@ -1385,8 +1385,8 @@ elm_smart_scroller_page_show(Evas_Object *obj, int pagenumber_h, int pagenumber_
    API_ENTRY return;
    Evas_Coord x, y, w, h;
    elm_smart_scroller_child_viewport_size_get(sd->smart_obj, &w, &h);
-   if (pagenumber_h) x = sd->pagesize_h * pagenumber_h;
-   if (pagenumber_v) y = sd->pagesize_v * pagenumber_v;
+   if (pagenumber_h >= 0) x = sd->pagesize_h * pagenumber_h;
+   if (pagenumber_v >= 0) y = sd->pagesize_v * pagenumber_v;
    if (_elm_smart_scroller_child_region_show_internal(obj, &x, &y, w, h))
      elm_smart_scroller_child_pos_set(obj, x, y);
 }
@@ -1397,8 +1397,8 @@ elm_smart_scroller_page_bring_in(Evas_Object *obj, int pagenumber_h, int pagenum
    API_ENTRY return;
    Evas_Coord x, y, w, h;
    elm_smart_scroller_child_viewport_size_get(sd->smart_obj, &w, &h);
-   if (pagenumber_h) x = sd->pagesize_h * pagenumber_h;
-   if (pagenumber_v) y = sd->pagesize_v * pagenumber_v;
+   if (pagenumber_h >= 0) x = sd->pagesize_h * pagenumber_h;
+   if (pagenumber_v >= 0) y = sd->pagesize_v * pagenumber_v;
    if (_elm_smart_scroller_child_region_show_internal(obj, &x, &y, w, h))
      {
         _smart_scrollto_x(sd, _elm_config->bring_in_scroll_friction, x);