enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 13 Pull Requests 2 Projects Releases Wiki Activity

From: Hyoyoung Chang <hyoyoung.chang@samsung.com> 

Subject: [E-devel] [patch] elm_scroller - add gravity functionality

I made a gravity features for stopping scroller.
Elm_scroller's fixed when child's growing lower.
However if scroller's child is growing upper,  
the elm_scroller always moving and waving to upper direction.
Because elm_scroller sets internal pan to keep current virtual position.
Gravity functions introduce to stopping scroller.



SVN revision: 64073
This commit is contained in:
Hyoyoung Chang 2011-10-14 10:57:31 +00:00 committed by Carsten Haitzler
parent 17cb85b2fc
commit fad1e70386
6 changed files with 115 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
legacy/elementary/src/lib/Elementary.h.in
View File

@ -7243,6 +7243,34 @@ extern "C" {
* @see elm_scroller_propagate_events_set()
*/
EAPI Eina_Bool elm_scroller_propagate_events_get(const Evas_Object *obj);
/**
* @brief Set scrolling gravity on a scroller
*
* @param obj The scroller object
* @param x The scrolling horizontal gravity
* @param y The scrolling vertical gravity
*
* 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 for x and y.
*/
EAPI void elm_scroller_gravity_set(Evas_Object *obj, double x, double y);
/**
* @brief Get scrolling gravity values for a scroller
*
* @param obj The scroller object
* @param x The scrolling horizontal gravity
* @param y The scrolling vertical gravity
*
* This gets gravity values for a scroller.
*
* @see elm_scroller_gravity_set()
*
*/
EAPI void elm_scroller_gravity_get(Evas_Object *obj, double *x, double *y);
/**
* @}
*/

20
legacy/elementary/src/lib/elm_scroller.c
View File

@ -718,3 +718,23 @@ elm_scroller_propagate_events_get(const Evas_Object *obj)
return evas_object_propagate_events_get(wd->scr);
}
EAPI void
elm_scroller_gravity_set(Evas_Object *obj, double x, double y)
{
ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return EINA_FALSE;
elm_smart_scroller_gravity_set(wd->scr, x, y);
}
EAPI void
elm_scroller_gravity_get(Evas_Object *obj, double *x, double *y)
{
ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return EINA_FALSE;
elm_smart_scroller_gravity_get(wd->scr, x, y);
}

41
legacy/elementary/src/lib/els_pan.c
View File

@ -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);
}

3
legacy/elementary/src/lib/els_pan.h
View File

@ -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);

22
legacy/elementary/src/lib/els_scroller.c
View File

@ -86,6 +86,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 {
@ -227,6 +229,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);
@ -283,6 +287,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);
@ -1586,6 +1592,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)
{

2
legacy/elementary/src/lib/els_scroller.h
View File

@ -38,6 +38,8 @@ void elm_smart_scroller_page_show (Evas_Object *obj, int pagenumbe
void elm_smart_scroller_page_bring_in (Evas_Object *obj, int pagenumber_h, int pagenumber_v);
void elm_smart_scroller_region_bring_in (Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
void elm_smart_scroller_widget_set (Evas_Object *obj, Evas_Object *wid);
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);
Eina_Bool elm_smart_scroller_momentum_animator_disabled_get (Evas_Object *obj);
void elm_smart_scroller_momentum_animator_disabled_set (Evas_Object *obj, Eina_Bool disabled);
void elm_smart_scroller_bounce_animator_disabled_set (Evas_Object *obj, Eina_Bool disabled);