From 5abc5e0748601f58e0d1ef607454747bcf848713 Mon Sep 17 00:00:00 2001 From: Hyoyoung Chang Date: Wed, 12 Oct 2011 20:04:31 +0900 Subject: [PATCH] [scroller] add gravitity feature Change-Id: I8bcbd8803371231bb434f0f1875d17ad8bde192d --- src/lib/Elementary.h.in | 2 ++ src/lib/elm_priv.h | 2 ++ src/lib/elm_scroller.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ src/lib/els_pan.c | 41 ++++++++++++++++++++++++++++++++++++++++- src/lib/els_pan.h | 3 +++ src/lib/els_scroller.c | 22 ++++++++++++++++++++++ src/lib/els_scroller.h | 2 ++ 7 files changed, 119 insertions(+), 1 deletion(-) diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in index 2f72662..68b96eb 100644 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in @@ -2976,6 +2976,8 @@ extern "C" { EAPI void elm_scroller_region_bring_in(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) EINA_ARG_NONNULL(1); EAPI void elm_scroller_propagate_events_set(Evas_Object *obj, Eina_Bool propagation); EAPI Eina_Bool elm_scroller_propagate_events_get(const Evas_Object *obj); + EAPI void elm_scroller_gravity_set(Evas_Object *obj, double x, double y) EINA_ARG_NONNULL(1); + EAPI void elm_scroller_gravity_get(const Evas_Object *obj, double *x, double *y) EINA_ARG_NONNULL(1); EINA_DEPRECATED EAPI void elm_scroller_page_move_set(Evas_Object *obj, Eina_Bool set); /* smart callbacks called: * "edge,left" - the left edge of the content has been reached diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h index e68ce22..43656af 100644 --- a/src/lib/elm_priv.h +++ b/src/lib/elm_priv.h @@ -37,6 +37,8 @@ void _elm_smart_pan_get (Evas_Object *obj, Evas_Coord *x, Eva void _elm_smart_pan_max_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); void _elm_smart_pan_min_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); void _elm_smart_pan_child_size_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); +void _elm_smart_pan_gravity_set (Evas_Object *obj, double x, double y); +void _elm_smart_pan_gravity_get (Evas_Object *obj, double *x, double *y); // els_scroller.h typedef enum _Elm_Smart_Scroller_Policy diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c index 1cad5ce..98277ab 100644 --- a/src/lib/elm_scroller.c +++ b/src/lib/elm_scroller.c @@ -922,6 +922,54 @@ elm_scroller_propagate_events_get(const Evas_Object *obj) return elm_smart_scroller_propagate_events_get(wd->scr); } +/** + * Set scrolling gravity on a scroller + * + * It set scrolling gravity. It adds scrolling weight values + * to the scroller. Usually it uses for stopping the scroller. + * To set y as 0.0 for lower growing child objects, + * even though child objects are added to bottom, the scroller doesn't move. + * To set y as 1.0 for upper growing child objects. And x is horizontal gravity. + * By default 0.0 + * + * @param obj The scroller object + * @param x The scrolling horizontal gravity + * @param y The scrolling vertical gravity + * + * @ingroup Scroller + */ +EAPI void +elm_scroller_gravity_set(Evas_Object *obj, double x, double y) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return EINA_FALSE; + + elm_smart_scroller_gravity_set(wd->scr, x, y); +} + +/** + * Get scrolling gravity values for a scroller + * + * This gets gravity values for a scroller. See + * elm_scroller_gravity_set() for more information + * + * @param obj The scroller object + * @param x The scrolling horizontal gravity + * @param y The scrolling vertical gravity + * + * @ingroup Scroller + */ +EAPI void +elm_scroller_gravity_get(const Evas_Object *obj, double *x, double *y) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return EINA_FALSE; + + elm_smart_scroller_gravity_get(wd->scr, x, y); +} + EAPI void elm_scroller_page_move_set(Evas_Object *obj, Eina_Bool set) { diff --git a/src/lib/els_pan.c b/src/lib/els_pan.c index 3f614c3..ff3cc5c 100644 --- a/src/lib/els_pan.c +++ b/src/lib/els_pan.c @@ -12,6 +12,8 @@ struct _Smart_Data Evas_Object *child_obj; Evas_Coord x, y, w, h; Evas_Coord child_w, child_h, px, py; + double gravity_x, gravity_y; + Evas_Coord prev_cw, prev_ch, delta_posx, delta_posy; }; /* local subsystem functions */ @@ -140,6 +142,26 @@ _elm_smart_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) if (h) *h = sd->child_h; } +void +_elm_smart_pan_gravity_set(Evas_Object *obj, double x, double y) +{ + API_ENTRY return; + sd->gravity_x = x; + sd->gravity_y = y; + sd->prev_cw = sd->child_w; + sd->prev_ch = sd->child_h; + sd->delta_posx = 0; + sd->delta_posy = 0; +} + +void +_elm_smart_pan_gravity_get(Evas_Object *obj, double *x, double *y) +{ + API_ENTRY return; + if (x) *x = sd->gravity_x; + if (y) *y = sd->gravity_y; +} + /* local subsystem functions */ static void _smart_child_del_hook(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) @@ -171,7 +193,22 @@ _smart_child_resize_hook(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS static void _smart_reconfigure(Smart_Data *sd) { - evas_object_move(sd->child_obj, sd->x - sd->px, sd->y - sd->py); + if (sd->gravity_x || sd->gravity_y) + { + sd->delta_posx += sd->child_w - sd->prev_cw; + sd->prev_cw = sd->child_w; + sd->delta_posy += sd->child_h - sd->prev_ch; + sd->prev_ch = sd->child_h; + + evas_object_move(sd->child_obj, + sd->x - sd->px - (sd->delta_posx*sd->gravity_x), + sd->y - sd->py - (sd->delta_posy*sd->gravity_y)); + sd->px += sd->delta_posx*sd->gravity_x; + sd->py += sd->delta_posy*sd->gravity_y; + + } + else + evas_object_move(sd->child_obj, sd->x - sd->px, sd->y - sd->py); } static void @@ -186,6 +223,8 @@ _smart_add(Evas_Object *obj) sd->y = 0; sd->w = 0; sd->h = 0; + sd->gravity_x = 0.0; + sd->gravity_y = 0.0; evas_object_smart_data_set(obj, sd); } diff --git a/src/lib/els_pan.h b/src/lib/els_pan.h index cb64fa1..a00ef2b 100644 --- a/src/lib/els_pan.h +++ b/src/lib/els_pan.h @@ -6,3 +6,6 @@ void _elm_smart_pan_get (Evas_Object *obj, Evas_Coord *x, Eva void _elm_smart_pan_max_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); void _elm_smart_pan_min_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); void _elm_smart_pan_child_size_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); +void _elm_smart_pan_gravity_set (Evas_Object *obj, double x, double y); +void _elm_smart_pan_gravity_get (Evas_Object *obj, double *x, double *y); + diff --git a/src/lib/els_scroller.c b/src/lib/els_scroller.c index 484efdb..3a7d966 100644 --- a/src/lib/els_scroller.c +++ b/src/lib/els_scroller.c @@ -84,6 +84,8 @@ struct _Smart_Data void (*max_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); void (*min_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); void (*child_size_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); + void (*gravity_set) (Evas_Object *obj, double x, double y); + void (*gravity_get) (Evas_Object *obj, double *x, double *y); } pan_func; struct { @@ -224,6 +226,8 @@ elm_smart_scroller_child_set(Evas_Object *obj, Evas_Object *child) sd->pan_func.max_get = _elm_smart_pan_max_get; sd->pan_func.min_get = _elm_smart_pan_min_get; sd->pan_func.child_size_get = _elm_smart_pan_child_size_get; + sd->pan_func.gravity_set = _elm_smart_pan_gravity_set; + sd->pan_func.gravity_get = _elm_smart_pan_gravity_get; evas_object_event_callback_add(child, EVAS_CALLBACK_DEL, _smart_child_del_hook, sd); _elm_smart_pan_child_set(sd->pan_obj, child); @@ -280,6 +284,8 @@ elm_smart_scroller_extern_pan_set(Evas_Object *obj, Evas_Object *pan, sd->pan_func.max_get = pan_max_get; sd->pan_func.min_get = pan_min_get; sd->pan_func.child_size_get = pan_child_size_get; + sd->pan_func.gravity_set = _elm_smart_pan_gravity_set; + sd->pan_func.gravity_get = _elm_smart_pan_gravity_get; sd->extern_pan = 1; evas_object_smart_callback_add(sd->pan_obj, "changed", _smart_pan_changed_hook, sd); evas_object_smart_callback_add(sd->pan_obj, "pan_changed", _smart_pan_pan_changed_hook, sd); @@ -1533,6 +1539,22 @@ _smart_pan_pan_changed_hook(void *data, Evas_Object *obj __UNUSED__, void *event _elm_smart_scroller_wanted_region_set(sd->smart_obj); } +void +elm_smart_scroller_gravity_set(Evas_Object *obj, double x, double y) +{ + API_ENTRY return; + + sd->pan_func.gravity_set(sd->pan_obj, x, y); +} + +void +elm_smart_scroller_gravity_get(Evas_Object *obj, double *x, double *y) +{ + API_ENTRY return; + + sd->pan_func.gravity_get(sd->pan_obj, x, y); +} + static void _smart_event_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { diff --git a/src/lib/els_scroller.h b/src/lib/els_scroller.h index eefe421..b73b4ee 100644 --- a/src/lib/els_scroller.h +++ b/src/lib/els_scroller.h @@ -28,6 +28,8 @@ void elm_smart_scroller_object_theme_set (Evas_Object *parent, Evas_Objec void elm_smart_scroller_mirrored_set (Evas_Object *obj, Eina_Bool mirrored); void elm_smart_scroller_hold_set (Evas_Object *obj, Eina_Bool hold); void elm_smart_scroller_freeze_set (Evas_Object *obj, Eina_Bool freeze); +void elm_smart_scroller_gravity_set (Evas_Object *obj, double x, double y); +void elm_smart_scroller_gravity_get (Evas_Object *obj, double *x, double *y); void elm_smart_scroller_bounce_allow_set (Evas_Object *obj, Eina_Bool horiz, Eina_Bool vert); void elm_smart_scroller_bounce_allow_get (const Evas_Object *obj, Eina_Bool *horiz, Eina_Bool *vert); void elm_smart_scroller_paging_set (Evas_Object *obj, double pagerel_h, double pagerel_v, Evas_Coord pagesize_h, Evas_Coord pagesize_v); -- 2.7.4