scrollable_interface: fixed gravity_set() API.

Summary: elm_scroller_gravity_set()  API is not working.

Test Plan: elementary_test -> scroller3

Reviewers: jaehwan, SanghyeonLee, Hermet, jypark, raster, cedric

Subscribers: cedric, jpeg

Differential Revision: https://phab.enlightenment.org/D4252

Signed-off-by: Hosang Kim <hosang12.kim@samsung.com>
Change-Id: I8716daa0e99b6fbf16579883825df5b43d54ec9c

diff --git a/src/bin/test_scroller.c b/src/bin/test_scroller.c
index eb00f2594614448e9a53aeb5582a8b490bb6681c..11106450af1f78261b83549d12eb749a0d6e9885 100644 (file)
--- a/src/bin/test_scroller.c
+++ b/src/bin/test_scroller.c
@@ -592,6 +592,15 @@ _append_items(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UN
    _timer = ecore_timer_add(0.3, _append_cb, data);
 }
 
+static void
+_changed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+       Evas_Object *sl = data;
+       double val = elm_slider_value_get(obj);
+       elm_scroller_gravity_set(sl, 0.0, val);
+       printf("Gravity change to %lf\n",val);
+}
+
 static void
 _win_del_cb(void *data EINA_UNUSED,
                Evas *e EINA_UNUSED,
@@ -605,7 +614,7 @@ _win_del_cb(void *data EINA_UNUSED,
 void
 test_scroller3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
-   Evas_Object *win, *bt, *bt2, *bt3, *bx, *bx2, *bx3, *bx4, *sc;
+   Evas_Object *win, *bt, *bt2, *bt3, *bx, *bx2, *bx3, *bx4, *sc, *sl;
    _count = 0;
 
    win = elm_win_util_standard_add("scroller3", "Scroller 3");
@@ -639,9 +648,20 @@ test_scroller3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
    elm_box_pack_end(bx2, bt3);
    evas_object_show(bt3);
 
+   sl = elm_slider_add(bx);
+   elm_object_text_set(sl, "Gravity");
+   elm_slider_unit_format_set(sl, "%1.1f");
+   elm_slider_indicator_format_set(sl, "%1.1f");
+   elm_slider_min_max_set(sl, 0, 1);
+   elm_slider_value_set(sl, 0.0);
+   evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.1);
+   elm_box_pack_end(bx, sl);
+   evas_object_show(sl);
+
    bx3 = elm_box_add(bx);
    evas_object_size_hint_align_set(bx3, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   evas_object_size_hint_weight_set(bx3, EVAS_HINT_EXPAND, 0.9);
+   evas_object_size_hint_weight_set(bx3, EVAS_HINT_EXPAND, 0.8);
    elm_box_pack_end(bx, bx3);
    evas_object_show(bx3);
 
@@ -660,6 +680,7 @@ test_scroller3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
    evas_object_smart_callback_add(bt, "clicked", _append_item, bx4);
    evas_object_smart_callback_add(bt2, "clicked", _prepend_item, bx4);
    evas_object_smart_callback_add(bt3, "clicked", _append_items, bx4);
+   evas_object_smart_callback_add(sl, "changed", _changed_cb, sc);
 
    evas_object_resize(win, 500, 500);
    evas_object_show(win);

diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c
index 18c77ac7841caf3b210f48995a09b68826247376..b06abfbe7bcf55c36d4d455946f433c962b93f6d 100644 (file)
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -64,25 +64,7 @@ _round(double value, int pos)
 static void
 _elm_pan_update(Elm_Pan_Smart_Data *psd)
 {
-   if (!psd->gravity_x && !psd->gravity_y)
-     {
-        evas_object_move(psd->content, psd->x - psd->px, psd->y - psd->py);
-        return;
-     }
-
-   if ((!psd->px) && (!psd->py))
-     {
-        psd->px = psd->delta_posx * psd->gravity_x;
-        psd->py = psd->delta_posy * psd->gravity_y;
-     }
-   psd->delta_posx += psd->content_w - psd->prev_cw;
-   psd->prev_cw = psd->content_w;
-   psd->delta_posy += psd->content_h - psd->prev_ch;
-   psd->prev_ch = psd->content_h;
-
    evas_object_move(psd->content, psd->x - psd->px, psd->y - psd->py);
-   psd->px = psd->delta_posx * psd->gravity_x;
-   psd->py = psd->delta_posy * psd->gravity_y;
 }
 
 EOLIAN static void
@@ -195,24 +177,6 @@ _elm_pan_content_size_get(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coo
    if (h) *h = psd->content_h;
 }
 
-EOLIAN static void
-_elm_pan_gravity_set(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, double x, double y)
-{
-   psd->gravity_x = x;
-   psd->gravity_y = y;
-   psd->prev_cw = psd->content_w;
-   psd->prev_ch = psd->content_h;
-   psd->delta_posx = 0;
-   psd->delta_posy = 0;
-}
-
-EOLIAN static void
-_elm_pan_gravity_get(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, double *x, double *y)
-{
-   if (x) *x = psd->gravity_x;
-   if (y) *y = psd->gravity_y;
-}
-
 static Evas_Object *
 _elm_pan_add(Evas *evas)
 {
@@ -241,8 +205,7 @@ _elm_pan_content_del_cb(void *data,
 
    psd = data;
    psd->content = NULL;
-   psd->content_w = psd->content_h = psd->px = psd->py =
-           psd->prev_cw = psd->prev_ch = psd->delta_posx = psd->delta_posy = 0;
+   psd->content_w = psd->content_h = psd->px = psd->py = 0;
    eo_do(psd->self, eo_event_callback_call(ELM_PAN_EVENT_CHANGED, NULL));
 }
 
@@ -1899,6 +1862,12 @@ _elm_scroll_wanted_region_set(Evas_Object *obj)
         wh = sid->wh;
      }
 
+   wx += (sid->content_info.w - sid->prev_cw) * sid->gravity_x;
+   sid->wy += (sid->content_info.h - sid->prev_ch) * sid->gravity_y;
+
+   sid->prev_cw = sid->content_info.w;
+   sid->prev_ch = sid->content_info.h;
+
    eo_do(obj, elm_interface_scrollable_content_region_set(wx, sid->wy, ww, wh));
 }
 
@@ -4543,17 +4512,17 @@ _elm_interface_scrollable_region_bring_in(Eo *obj, Elm_Scrollable_Smart_Interfac
 EOLIAN static void
 _elm_interface_scrollable_gravity_set(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_Interface_Data *sid, double x, double y)
 {
-   if (!sid->pan_obj) return;
-
-   eo_do(sid->pan_obj, elm_obj_pan_gravity_set(x, y));
+   sid->gravity_x = x;
+   sid->gravity_y = y;
+   sid->prev_cw = sid->content_info.w;
+   sid->prev_ch = sid->content_info.h;
 }
 
 EOLIAN static void
 _elm_interface_scrollable_gravity_get(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_Interface_Data *sid, double *x, double *y)
 {
-   if (!sid->pan_obj) return;
-
-   eo_do(sid->pan_obj, elm_obj_pan_gravity_get(x, y));
+   if (x) *x = sid->gravity_x;
+   if (y) *y = sid->gravity_y;
 }
 
 EOLIAN static void

diff --git a/src/lib/elm_interface_scrollable.h b/src/lib/elm_interface_scrollable.h
index a44f956420da5df3b0bdc072947bca203dd09672..a3ec419558285147e158add4888c8f2488d36b5f 100644 (file)
--- a/src/lib/elm_interface_scrollable.h
+++ b/src/lib/elm_interface_scrollable.h
@@ -44,8 +44,6 @@ struct _Elm_Pan_Smart_Data
    Evas_Object                   *content;
    Evas_Coord                     x, y, w, h;
    Evas_Coord                     content_w, content_h, px, py;
-   double                         gravity_x, gravity_y;
-   Evas_Coord                     prev_cw, prev_ch, delta_posx, delta_posy;
 };
 
 /**
@@ -195,6 +193,10 @@ struct _Elm_Scrollable_Smart_Interface_Data
    unsigned char size_adjust_recurse;
    unsigned char size_count;
    void         *event_info;
+
+   double                         gravity_x, gravity_y;
+   Evas_Coord                     prev_cw, prev_ch;
+
    Eina_Bool  size_adjust_recurse_abort : 1;
 
    Eina_Bool  momentum_animator_disabled : 1;

diff --git a/src/lib/elm_pan.eo b/src/lib/elm_pan.eo
index a7f2a320a88c32679005f59f6614624ffa1aa7aa..72772c90a2733b979f6409b294146ded778f4714 100644 (file)
--- a/src/lib/elm_pan.eo
+++ b/src/lib/elm_pan.eo
@@ -3,16 +3,6 @@ class Elm_Pan (Evas.Smart_Clipped)
    eo_prefix: elm_obj_pan;
    data: Elm_Pan_Smart_Data;
    methods {
-      @property gravity {
-         set @internal {
-         }
-         get @internal {
-         }
-         values {
-            x: double;
-            y: double;
-         }
-      }
       @property pos {
          set @internal {
          }