#include <Elementary.h>
#include "elm_priv.h"
+#include "els_scroller.h"
+#include "els_pan.h"
#define SMART_NAME "els_scroller"
#define API_ENTRY Smart_Data *sd; sd = evas_object_smart_data_get(obj); if ((!obj) || (!sd) || (evas_object_type_get(obj) && strcmp(evas_object_type_get(obj), SMART_NAME)))
Elm_Smart_Scroller_Policy hbar_flags, vbar_flags;
- struct {
+ struct
+ {
Evas_Coord x, y;
Evas_Coord sx, sy;
Evas_Coord dx, dy;
Evas_Coord bx0, by0;
Evas_Coord b0x, b0y;
Evas_Coord b2x, b2y;
- struct {
+ struct
+ {
Evas_Coord x, y;
double timestamp, localtimestamp;
- } history[60];
- struct {
- double tadd, dxsum, dysum;
- double est_timestamp_diff;
- } hist;
- double anim_start;
- double anim_start2;
- double anim_start3;
- double onhold_vx, onhold_vy, onhold_tlast, onhold_vxe, onhold_vye;
- double extra_time;
- Evas_Coord hold_x, hold_y;
- Ecore_Animator *hold_animator;
- Ecore_Animator *onhold_animator;
- Ecore_Animator *momentum_animator;
- Ecore_Animator *bounce_x_animator;
- Ecore_Animator *bounce_y_animator;
- Evas_Coord locked_x, locked_y;
- int hdir, vdir;
- unsigned char now : 1;
- unsigned char cancelled : 1;
- unsigned char hold : 1;
- unsigned char hold_parent : 1;
- unsigned char want_dragged : 1;
- unsigned char dragged : 1;
- unsigned char dragged_began : 1;
- unsigned char dir_x : 1;
- unsigned char dir_y : 1;
- unsigned char locked : 1;
- unsigned char bounce_x_hold : 1;
- unsigned char bounce_y_hold : 1;
- unsigned char scroll : 1;
- unsigned char want_reset : 1;
- } down;
-
- struct {
- Evas_Coord w, h;
- } child;
- struct {
- Evas_Coord x, y;
- } step, page;
-
- struct {
- void (*set) (Evas_Object *obj, Evas_Coord x, Evas_Coord y);
- void (*get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
- 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);
- } pan_func;
-
- struct {
- struct {
- Evas_Coord start, end;
- double t_start, t_end;
- Ecore_Animator *animator;
- } x, y;
- } scrollto;
+ } history[60];
+ struct
+ {
+ double tadd, dxsum, dysum;
+ double est_timestamp_diff;
+ } hist;
+ double anim_start;
+ double anim_start2;
+ double anim_start3;
+ double onhold_vx, onhold_vy, onhold_tlast, onhold_vxe, onhold_vye;
+ double extra_time;
+ Evas_Coord hold_x, hold_y;
+ Ecore_Animator *hold_animator;
+ Ecore_Animator *onhold_animator;
+ Ecore_Animator *momentum_animator;
+ Ecore_Animator *bounce_x_animator;
+ Ecore_Animator *bounce_y_animator;
+ Evas_Coord locked_x, locked_y;
+ int hdir, vdir;
+ Eina_Bool now : 1;
+ Eina_Bool cancelled : 1;
+ Eina_Bool hold : 1;
+ Eina_Bool hold_parent : 1;
+ Eina_Bool want_dragged : 1;
+ Eina_Bool dragged : 1;
+ Eina_Bool dragged_began : 1;
+ Eina_Bool dir_x : 1;
+ Eina_Bool dir_y : 1;
+ Eina_Bool locked : 1;
+ Eina_Bool bounce_x_hold : 1;
+ Eina_Bool bounce_y_hold : 1;
+ Eina_Bool scroll : 1;
+ Eina_Bool want_reset : 1;
+ } down;
+
+ struct
+ {
+ Evas_Coord w, h;
+ Eina_Bool resized : 1;
+ } child;
+ struct
+ {
+ Evas_Coord x, y;
+ } step, page;
+
+ struct
+ {
+ void (*set) (Evas_Object *obj, Evas_Coord x, Evas_Coord y);
+ void (*get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
+ 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
+ {
+ struct
+ {
+ Evas_Coord start, end;
+ double t_start, t_end;
+ Ecore_Animator *animator;
+ } x, y;
+ } scrollto;
double pagerel_h, pagerel_v;
Evas_Coord pagesize_h, pagesize_v;
- unsigned char hbar_visible : 1;
- unsigned char vbar_visible : 1;
- unsigned char extern_pan : 1;
- unsigned char one_dir_at_a_time : 1;
- unsigned char hold : 1;
- unsigned char freeze : 1;
- unsigned char bouncemex : 1;
- unsigned char bouncemey : 1;
- unsigned char bounce_horiz : 1;
- unsigned char bounce_vert : 1;
- unsigned char event_propagation :1;
+ Eina_Bool hbar_visible : 1;
+ Eina_Bool vbar_visible : 1;
+ Eina_Bool extern_pan : 1;
+ Eina_Bool one_dir_at_a_time : 1;
+ Eina_Bool hold : 1;
+ Eina_Bool freeze : 1;
+ Eina_Bool bouncemex : 1;
+ Eina_Bool bouncemey : 1;
+ Eina_Bool bounce_horiz : 1;
+ Eina_Bool bounce_vert : 1;
Eina_Bool momentum_animator_disabled :1;
Eina_Bool bounce_animator_disabled :1;
Eina_Bool is_mirrored : 1;
/* local subsystem functions */
static void _smart_child_del_hook(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _smart_pan_changed_hook(void *data, Evas_Object *obj, void *event_info);
-static void _smart_pan_pan_changed_hook(void *data, Evas_Object *obj, void *event_info);
static void _smart_event_wheel(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
static Eina_Bool _smart_hold_animator(void *data);
static void _smart_clip_unset(Evas_Object *obj);
static void _smart_init(void);
+static void _elm_smart_scroller_wanted_region_set(Evas_Object *obj);
+
/* local subsystem globals */
static Evas_Smart *_smart = NULL;
o = _elm_smart_pan_add(evas_object_evas_get(obj));
sd->pan_obj = o;
evas_object_smart_callback_add(o, "changed", _smart_pan_changed_hook, sd);
- evas_object_smart_callback_add(o, "pan_changed", _smart_pan_pan_changed_hook, sd);
edje_object_part_swallow(sd->edje_obj, "elm.swallow.content", o);
}
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);
if (sd->pan_obj)
{
evas_object_smart_callback_del(sd->pan_obj, "changed", _smart_pan_changed_hook);
- evas_object_smart_callback_del(sd->pan_obj, "pan_changed", _smart_pan_pan_changed_hook);
}
if (sd->extern_pan)
}
if (!pan)
{
- sd->extern_pan = 0;
+ sd->extern_pan = EINA_FALSE;
return;
}
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->extern_pan = 1;
+ sd->pan_func.gravity_set = _elm_smart_pan_gravity_set;
+ sd->pan_func.gravity_get = _elm_smart_pan_gravity_get;
+ sd->extern_pan = EINA_TRUE;
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);
edje_object_part_swallow(sd->edje_obj, "elm.swallow.content", sd->pan_obj);
evas_object_show(sd->pan_obj);
}
{
ecore_animator_del(sd->down.momentum_animator);
sd->down.momentum_animator = NULL;
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
}
}
}
* adjust a bit. */
elm_smart_scroller_child_viewport_size_get(sd->smart_obj, &sd->ww, &sd->wh);
if (x < 0)
- sd->wx = 0;
+ sd->wx = 0;
else if ((x + sd->ww) > cw)
- sd->wx = cw - sd->ww;
+ sd->wx = cw - sd->ww;
else if (sd->is_mirrored)
- sd->wx = _elm_smart_scroller_x_mirrored_get(sd->smart_obj, x);
+ sd->wx = _elm_smart_scroller_x_mirrored_get(sd->smart_obj, x);
else
- sd->wx = x;
+ sd->wx = x;
if (y < 0) sd->wy = 0;
else if ((y + sd->wh) > ch) sd->wy = ch - sd->wh;
else sd->wy = y;
tt = 1.0 - (tt * tt);
sd->pan_func.get(sd->pan_obj, &px, &py);
px = (sd->scrollto.x.start * (1.0 - tt)) +
- (sd->scrollto.x.end * tt);
+ (sd->scrollto.x.end * tt);
if (t >= sd->scrollto.x.t_end)
{
px = sd->scrollto.x.end;
elm_smart_scroller_child_pos_set(sd->smart_obj, px, py);
+ sd->down.sx = px;
+ sd->down.x = sd->down.history[0].x;
+ _update_wanted_coordinates(sd, px, py);
sd->scrollto.x.animator = NULL;
if ((!sd->scrollto.y.animator) && (!sd->down.bounce_y_animator))
_smart_anim_stop(sd->smart_obj);
return ECORE_CALLBACK_CANCEL;
}
elm_smart_scroller_child_pos_set(sd->smart_obj, px, py);
+ _update_wanted_coordinates(sd, px, py);
return ECORE_CALLBACK_RENEW;
}
ecore_animator_del(sd->down.momentum_animator);
sd->down.momentum_animator = NULL;
- sd->down.bounce_x_hold = 0;
- sd->down.bounce_y_hold = 0;
+ sd->down.bounce_x_hold = EINA_FALSE;
+ sd->down.bounce_y_hold = EINA_FALSE;
sd->down.ax = 0;
sd->down.ay = 0;
sd->down.dx = 0;
sd->down.dy = 0;
sd->down.pdx = 0;
sd->down.pdy = 0;
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
}
}
ecore_animator_del(sd->down.bounce_x_animator);
sd->down.bounce_x_animator = NULL;
_smart_momentum_end(sd);
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
}
- sd->bouncemex = 0;
+ sd->bouncemex = EINA_FALSE;
}
static Eina_Bool
tt = 1.0 - (tt * tt);
sd->pan_func.get(sd->pan_obj, &px, &py);
py = (sd->scrollto.y.start * (1.0 - tt)) +
- (sd->scrollto.y.end * tt);
+ (sd->scrollto.y.end * tt);
if (t >= sd->scrollto.y.t_end)
{
py = sd->scrollto.y.end;
elm_smart_scroller_child_pos_set(sd->smart_obj, px, py);
+ sd->down.sy = py;
+ sd->down.y = sd->down.history[0].y;
+ _update_wanted_coordinates(sd, px, py);
sd->scrollto.y.animator = NULL;
if ((!sd->scrollto.x.animator) && (!sd->down.bounce_x_animator))
_smart_anim_stop(sd->smart_obj);
return ECORE_CALLBACK_CANCEL;
}
elm_smart_scroller_child_pos_set(sd->smart_obj, px, py);
+ _update_wanted_coordinates(sd, px, py);
return ECORE_CALLBACK_RENEW;
}
ecore_animator_del(sd->down.bounce_y_animator);
sd->down.bounce_y_animator = NULL;
_smart_momentum_end(sd);
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
}
- sd->bouncemey = 0;
+ sd->bouncemey = EINA_FALSE;
}
static Eina_Bool
x += offset;
if (sd->pagerel_h > 0.0)
- {
- x = x + (w * sd->pagerel_h * 0.5);
- x = x / (w * sd->pagerel_h);
- x = x * (w * sd->pagerel_h);
- }
- else if (sd->pagesize_h > 0)
+ sd->pagesize_h = w * sd->pagerel_h;
+ if (sd->pagesize_h > 0)
{
x = x + (sd->pagesize_h * 0.5);
x = x / (sd->pagesize_h);
y += offset;
if (sd->pagerel_v > 0.0)
- {
- y = y + (h * sd->pagerel_v * 0.5);
- y = y / (h * sd->pagerel_v);
- y = y * (h * sd->pagerel_v);
- }
- else if (sd->pagesize_v > 0)
+ sd->pagesize_v = h * sd->pagerel_v;
+ if (sd->pagesize_v > 0)
{
y = y + (sd->pagesize_v * 0.5);
y = y / (sd->pagesize_v);
_smart_bounce_x_animator(void *data)
{
Smart_Data *sd;
- Evas_Coord x, y, dx, px, w, odx, ed, md;
+ Evas_Coord x, y, dx, w, odx, ed, md;
double t, p, dt, pd, r;
sd = data;
{
dt = dt / _elm_config->thumbscroll_bounce_friction;
odx = sd->down.b2x - sd->down.bx;
- sd->pan_func.get(sd->pan_obj, &px, NULL);
elm_smart_scroller_child_viewport_size_get(sd->smart_obj, &w, NULL);
- if (!sd->down.momentum_animator && ((w - px) > 0) && ((-px) < w))
+ if (!sd->down.momentum_animator && (w > abs(odx)))
{
pd = (double)odx / (double)w;
pd = (pd > 0) ? pd : -pd;
if (sd->down.momentum_animator)
{
ed = abs(sd->down.dx * (_elm_config->thumbscroll_friction + sd->down.extra_time) - sd->down.b0x);
- md = abs(_elm_config->thumbscroll_friction*5*w);
+ md = abs(_elm_config->thumbscroll_friction * 5 * w);
if (ed > md) r = (double)(md)/(double)ed;
}
- x = sd->down.b2x + (int)((double)(dx - odx)*r);
+ x = sd->down.b2x + (int)((double)(dx - odx) * r);
if (!sd->down.cancelled)
elm_smart_scroller_child_pos_set(sd->smart_obj, x, y);
if (dt >= 1.0)
{
if (sd->down.momentum_animator)
- sd->down.bounce_x_hold = 1;
- else if ((!sd->down.bounce_y_animator) &&
- (!sd->scrollto.y.animator))
+ sd->down.bounce_x_hold = EINA_TRUE;
+ if ((!sd->down.bounce_y_animator) &&
+ (!sd->scrollto.y.animator))
_smart_anim_stop(sd->smart_obj);
sd->down.bounce_x_animator = NULL;
sd->down.pdx = 0;
- sd->bouncemex = 0;
+ sd->bouncemex = EINA_FALSE;
_smart_momentum_end(sd);
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
return ECORE_CALLBACK_CANCEL;
}
}
_smart_bounce_y_animator(void *data)
{
Smart_Data *sd;
- Evas_Coord x, y, dy, py, h, ody, ed, md;
+ Evas_Coord x, y, dy, h, ody, ed, md;
double t, p, dt, pd, r;
sd = data;
{
dt = dt / _elm_config->thumbscroll_bounce_friction;
ody = sd->down.b2y - sd->down.by;
- sd->pan_func.get(sd->pan_obj, NULL, &py);
elm_smart_scroller_child_viewport_size_get(sd->smart_obj, NULL, &h);
- if (!sd->down.momentum_animator && ((h - py) > 0) && ((-py) < h))
+ if (!sd->down.momentum_animator && (h > abs(ody)))
{
pd = (double)ody / (double)h;
pd = (pd > 0) ? pd : -pd;
if (sd->down.momentum_animator)
{
ed = abs(sd->down.dy * (_elm_config->thumbscroll_friction + sd->down.extra_time) - sd->down.b0y);
- md = abs(_elm_config->thumbscroll_friction*5*h);
+ md = abs(_elm_config->thumbscroll_friction * 5 * h);
if (ed > md) r = (double)(md)/(double)ed;
}
- y = sd->down.b2y + (int)((double)(dy - ody)*r);
+ y = sd->down.b2y + (int)((double)(dy - ody) * r);
if (!sd->down.cancelled)
elm_smart_scroller_child_pos_set(sd->smart_obj, x, y);
if (dt >= 1.0)
{
if (sd->down.momentum_animator)
- sd->down.bounce_y_hold = 1;
- else if ((!sd->down.bounce_x_animator) &&
+ sd->down.bounce_y_hold = EINA_TRUE;
+ if ((!sd->down.bounce_x_animator) &&
(!sd->scrollto.y.animator))
_smart_anim_stop(sd->smart_obj);
sd->down.bounce_y_animator = NULL;
sd->down.pdy = 0;
- sd->bouncemey = 0;
+ sd->bouncemey = EINA_FALSE;
_smart_momentum_end(sd);
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
return ECORE_CALLBACK_CANCEL;
}
}
sd->pan_func.get(sd->pan_obj, &px, &py);
switch (dir)
{
- case LEFT:
+ case LEFT:
if (px > minx) return EINA_TRUE;
break;
- case RIGHT:
+ case RIGHT:
if ((px - minx) < mx) return EINA_TRUE;
break;
- case UP:
+ case UP:
if (py > miny) return EINA_TRUE;
break;
- case DOWN:
+ case DOWN:
if ((py - miny) < my) return EINA_TRUE;
break;
- default:
+ default:
break;
}
return EINA_FALSE;
if ((sd->down.dir_y) && !can_scroll(sd, sd->down.vdir))
{
sd->down.dir_y = 0;
- }
- }
- if ((!sd->down.dir_x) && (!sd->down.dir_y))
- {
- sd->down.cancelled = 1;
- }
- */
+ }
+ }
+ if ((!sd->down.dir_x) && (!sd->down.dir_y))
+ {
+ sd->down.cancelled = 1;
+ }
+ */
dt = dt / (_elm_config->thumbscroll_friction + sd->down.extra_time);
if (dt > 1.0) dt = 1.0;
p = 1.0 - ((1.0 - dt) * (1.0 - dt));
_smart_anim_stop(sd->smart_obj);
sd->down.momentum_animator = NULL;
- sd->down.bounce_x_hold = 0;
- sd->down.bounce_y_hold = 0;
+ sd->down.bounce_x_hold = EINA_FALSE;
+ sd->down.bounce_y_hold = EINA_FALSE;
sd->down.ax = 0;
sd->down.ay = 0;
sd->down.pdx = 0;
sd->down.pdy = 0;
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
return ECORE_CALLBACK_CANCEL;
}
}
{
ecore_animator_del(sd->down.onhold_animator);
sd->down.onhold_animator = NULL;
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
}
if (sd->down.hold_animator)
{
ecore_animator_del(sd->down.hold_animator);
sd->down.hold_animator = NULL;
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
}
sd->pan_func.max_get(sd->pan_obj, &mx, &my);
sd->pan_func.min_get(sd->pan_obj, &minx, &miny);
if (((x < minx) && (0 <= sd->down.dx)) ||
((x > (mx + minx)) && (0 >= sd->down.dx)))
{
- sd->bouncemex = 1;
+ sd->bouncemex = EINA_TRUE;
bounce_eval(sd);
}
else
- sd->bouncemex = 0;
+ sd->bouncemex = EINA_FALSE;
}
if (!sd->down.bounce_y_animator)
{
if (((y < miny) && (0 <= sd->down.dy)) ||
((y > (my + miny)) && (0 >= sd->down.dy)))
{
- sd->bouncemey = 1;
+ sd->bouncemey = EINA_TRUE;
bounce_eval(sd);
}
else
- sd->bouncemey = 0;
+ sd->bouncemey = EINA_FALSE;
}
if ((x != px) || (y != py))
{
{
ecore_animator_del(sd->down.bounce_x_animator);
sd->down.bounce_x_animator = NULL;
- sd->bouncemex = 0;
+ sd->bouncemex = EINA_FALSE;
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
}
if (sd->down.bounce_y_animator)
{
ecore_animator_del(sd->down.bounce_y_animator);
sd->down.bounce_y_animator = NULL;
- sd->bouncemey = 0;
+ sd->bouncemey = EINA_FALSE;
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
}
if (sd->down.hold_animator)
{
ecore_animator_del(sd->down.hold_animator);
sd->down.hold_animator = NULL;
_smart_drag_stop(sd->smart_obj);
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
}
if (sd->down.momentum_animator)
{
ecore_animator_del(sd->down.momentum_animator);
sd->down.momentum_animator = NULL;
- sd->down.bounce_x_hold = 0;
- sd->down.bounce_y_hold = 0;
+ sd->down.bounce_x_hold = EINA_FALSE;
+ sd->down.bounce_y_hold = EINA_FALSE;
sd->down.ax = 0;
sd->down.ay = 0;
sd->down.pdx = 0;
sd->down.pdy = 0;
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
}
x = nx;
void
elm_smart_scroller_child_region_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
{
+ API_ENTRY return;
if (_elm_smart_scroller_child_region_show_internal(obj, &x, &y, w, h))
- elm_smart_scroller_child_pos_set(obj, x, y);
+ {
+ elm_smart_scroller_child_pos_set(obj, x, y);
+ sd->down.sx = x;
+ sd->down.sy = y;
+ sd->down.x = sd->down.history[0].x;
+ sd->down.y = sd->down.history[0].y;
+ }
}
/* Set should be used for setting the wanted position, for example a user scroll
sd->ww = w;
sd->wh = h;
if (_elm_smart_scroller_child_region_show_internal(obj, &x, &y, w, h))
- elm_smart_scroller_child_pos_set(obj, x, y);
+ {
+ elm_smart_scroller_child_pos_set(obj, x, y);
+ sd->down.sx = x;
+ sd->down.sy = y;
+ sd->down.x = sd->down.history[0].x;
+ sd->down.y = sd->down.history[0].y;
+ }
}
void
}
void
-elm_smart_scroller_propagate_events_set(Evas_Object *obj, Eina_Bool propagation)
-{
- API_ENTRY return;
- sd->event_propagation = propagation;
-
- evas_object_propagate_events_set(sd->edje_obj, propagation);
-}
-
-Eina_Bool
-elm_smart_scroller_propagate_events_get(Evas_Object *obj)
-{
- API_ENTRY return EINA_FALSE;
- return sd->event_propagation;
-}
-
-void
elm_smart_scroller_object_theme_set(Evas_Object *parent, Evas_Object *obj, const char *clas, const char *group, const char *style)
{
API_ENTRY return;
edje_object_part_swallow(sd->edje_obj, "elm.scrollbar.base", base);
}
if (!_elm_config->thumbscroll_enable)
- evas_object_size_hint_min_set(base, mw, mh);
+ evas_object_size_hint_min_set(base, mw, mh);
}
sd->vbar_visible = !sd->vbar_visible;
sd->hbar_visible = !sd->hbar_visible;
{
ecore_animator_del(sd->down.onhold_animator);
sd->down.onhold_animator = NULL;
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
}
}
else
elm_smart_scroller_bounce_allow_set(Evas_Object *obj, Eina_Bool horiz, Eina_Bool vert)
{
API_ENTRY return;
- sd->bounce_horiz = horiz;
- sd->bounce_vert = vert;
+ sd->bounce_horiz = !!horiz;
+ sd->bounce_vert = !!vert;
}
void
elm_smart_scroller_paging_get(Evas_Object *obj, double *pagerel_h, double *pagerel_v, Evas_Coord *pagesize_h, Evas_Coord *pagesize_v)
{
API_ENTRY return;
- if(pagerel_h) *pagerel_h = sd->pagerel_h;
- if(pagerel_v) *pagerel_v = sd->pagerel_v;
- if(pagesize_h) *pagesize_h = sd->pagesize_h;
- if(pagesize_v) *pagesize_v = sd->pagesize_v;
+ if (pagerel_h) *pagerel_h = sd->pagerel_h;
+ if (pagerel_v) *pagerel_v = sd->pagerel_v;
+ if (pagesize_h) *pagesize_h = sd->pagesize_h;
+ if (pagesize_v) *pagesize_v = sd->pagesize_v;
+}
+
+void
+elm_smart_scroller_current_page_get(Evas_Object *obj, int *pagenumber_h, int *pagenumber_v)
+{
+ API_ENTRY return;
+ Evas_Coord x, y;
+ elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
+ if (pagenumber_h)
+ {
+ if (sd->pagesize_h > 0)
+ *pagenumber_h = (x + sd->pagesize_h - 1) / sd->pagesize_h;
+ else
+ *pagenumber_h = 0;
+ }
+ if (pagenumber_v)
+ {
+ if (sd->pagesize_v > 0)
+ *pagenumber_v = (y + sd->pagesize_v - 1) / sd->pagesize_v;
+ else
+ *pagenumber_v = 0;
+ }
+}
+
+void
+elm_smart_scroller_last_page_get(Evas_Object *obj, int *pagenumber_h, int *pagenumber_v)
+{
+ API_ENTRY return;
+ Evas_Coord cw, ch;
+ sd->pan_func.child_size_get(sd->pan_obj, &cw, &ch);
+ if (pagenumber_h)
+ {
+ if (sd->pagesize_h > 0)
+ *pagenumber_h = cw / sd->pagesize_h + 1;
+ else
+ *pagenumber_h = 0;
+ }
+ if (pagenumber_v)
+ {
+ if (sd->pagesize_v > 0)
+ *pagenumber_v = ch / sd->pagesize_v + 1;
+ else
+ *pagenumber_v = 0;
+ }
+}
+
+void
+elm_smart_scroller_page_show(Evas_Object *obj, int pagenumber_h, int pagenumber_v)
+{
+ API_ENTRY return;
+ Evas_Coord x, y, w, h;
+ elm_smart_scroller_child_viewport_size_get(sd->smart_obj, &w, &h);
+ 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);
+}
+
+void
+elm_smart_scroller_page_bring_in(Evas_Object *obj, int pagenumber_h, int pagenumber_v)
+{
+ API_ENTRY return;
+ Evas_Coord x, y, w, h;
+ elm_smart_scroller_child_viewport_size_get(sd->smart_obj, &w, &h);
+ 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);
+ _smart_scrollto_y(sd, _elm_config->bring_in_scroll_friction, y);
+ }
}
void
if (sd->down.now || sd->down.momentum_animator ||
sd->down.bounce_x_animator || sd->down.bounce_y_animator ||
- sd->down.hold_animator || sd->down.onhold_animator) return;
+ sd->down.hold_animator || sd->down.onhold_animator ||
+ sd->scrollto.x.animator || sd->scrollto.y.animator) return;
+
+ sd->child.resized = EINA_FALSE;
/* Flip to RTL cords only if init in RTL mode */
- if(sd->is_mirrored)
+ if (sd->is_mirrored)
wx = _elm_smart_scroller_x_mirrored_get(obj, sd->wx);
if (sd->ww == -1)
sd->child.h = h;
_smart_scrollbar_size_adjust(sd);
evas_object_size_hint_min_set(sd->smart_obj, sd->child.w, sd->child.h);
+ sd->child.resized = EINA_TRUE;
_elm_smart_scroller_wanted_region_set(sd->smart_obj);
}
}
-static void
-_smart_pan_pan_changed_hook(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+void
+elm_smart_scroller_gravity_set(Evas_Object *obj, double x, double y)
{
- Smart_Data *sd;
+ API_ENTRY return;
- sd = data;
- if ((sd->down.bounce_x_animator) || (sd->down.bounce_y_animator) ||
- (sd->scrollto.x.animator) || (sd->scrollto.y.animator))
- {
- _smart_anim_stop(sd->smart_obj);
- }
- if (sd->scrollto.x.animator)
- {
- ecore_animator_del(sd->scrollto.x.animator);
- sd->scrollto.x.animator = NULL;
- }
- if (sd->scrollto.y.animator)
- {
- ecore_animator_del(sd->scrollto.y.animator);
- sd->scrollto.y.animator = NULL;
- }
- if (sd->down.bounce_x_animator)
- {
- ecore_animator_del(sd->down.bounce_x_animator);
- sd->down.bounce_x_animator = NULL;
- sd->bouncemex = 0;
- }
- if (sd->down.bounce_y_animator)
- {
- ecore_animator_del(sd->down.bounce_y_animator);
- sd->down.bounce_y_animator = NULL;
- sd->bouncemey = 0;
- }
- _elm_smart_scroller_wanted_region_set(sd->smart_obj);
+ 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
Evas_Event_Mouse_Wheel *ev;
Smart_Data *sd;
Evas_Coord x = 0, y = 0;
+ int direction = 0;
sd = data;
ev = event_info;
+ direction = ev->direction;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ;
if ((evas_key_modifier_is_set(ev->modifiers, "Control")) ||
(evas_key_modifier_is_set(ev->modifiers, "Alt")) ||
- (evas_key_modifier_is_set(ev->modifiers, "Shift")) ||
(evas_key_modifier_is_set(ev->modifiers, "Meta")) ||
(evas_key_modifier_is_set(ev->modifiers, "Hyper")) ||
(evas_key_modifier_is_set(ev->modifiers, "Super")))
return;
+ else if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
+ direction = 1;
elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
if ((sd->down.bounce_x_animator) || (sd->down.bounce_y_animator) ||
(sd->scrollto.x.animator) || (sd->scrollto.y.animator))
{
ecore_animator_del(sd->down.bounce_x_animator);
sd->down.bounce_x_animator = NULL;
- sd->bouncemex = 0;
+ sd->bouncemex = EINA_FALSE;
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
}
if (sd->down.bounce_y_animator)
{
ecore_animator_del(sd->down.bounce_y_animator);
sd->down.bounce_y_animator = NULL;
- sd->bouncemey = 0;
+ sd->bouncemey = EINA_FALSE;
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
}
- if (!ev->direction)
+ if (!direction)
y += ev->z * sd->step.y;
- else if (ev->direction == 1)
+ else if (direction == 1)
x += ev->z * sd->step.x;
if ((!sd->hold) && (!sd->freeze))
// if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ;
if (_elm_config->thumbscroll_enable)
{
- sd->down.hold = 0;
+ sd->down.hold = EINA_FALSE;
if ((sd->down.bounce_x_animator) || (sd->down.bounce_y_animator) ||
(sd->down.momentum_animator) || (sd->scrollto.x.animator) ||
(sd->scrollto.y.animator))
{
ev->event_flags |= EVAS_EVENT_FLAG_ON_SCROLL | EVAS_EVENT_FLAG_ON_HOLD;
- sd->down.scroll = 1;
- sd->down.hold = 1;
+ sd->down.scroll = EINA_TRUE;
+ sd->down.hold = EINA_TRUE;
_smart_anim_stop(sd->smart_obj);
}
if (sd->scrollto.x.animator)
{
ecore_animator_del(sd->down.bounce_x_animator);
sd->down.bounce_x_animator = NULL;
- sd->bouncemex = 0;
+ sd->bouncemex = EINA_FALSE;
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
}
if (sd->down.bounce_y_animator)
{
ecore_animator_del(sd->down.bounce_y_animator);
sd->down.bounce_y_animator = NULL;
- sd->bouncemey = 0;
+ sd->bouncemey = EINA_FALSE;
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
}
if (sd->down.hold_animator)
{
ecore_animator_del(sd->down.hold_animator);
sd->down.hold_animator = NULL;
_smart_drag_stop(sd->smart_obj);
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
}
if (sd->down.momentum_animator)
{
ecore_animator_del(sd->down.momentum_animator);
sd->down.momentum_animator = NULL;
- sd->down.bounce_x_hold = 0;
- sd->down.bounce_y_hold = 0;
+ sd->down.bounce_x_hold = EINA_FALSE;
+ sd->down.bounce_y_hold = EINA_FALSE;
sd->down.ax = 0;
sd->down.ay = 0;
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
}
if (ev->button == 1)
{
sd->down.hist.tadd = 0.0;
sd->down.hist.dxsum = 0.0;
sd->down.hist.dysum = 0.0;
- sd->down.now = 1;
- sd->down.dragged = 0;
- sd->down.dir_x = 0;
- sd->down.dir_y = 0;
+ sd->down.now = EINA_TRUE;
+ sd->down.dragged = EINA_FALSE;
+ sd->down.dir_x = EINA_FALSE;
+ sd->down.dir_y = EINA_FALSE;
sd->down.x = ev->canvas.x;
sd->down.y = ev->canvas.y;
elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
sd->down.sx = x;
sd->down.sy = y;
- sd->down.locked = 0;
+ sd->down.locked = EINA_FALSE;
memset(&(sd->down.history[0]), 0, sizeof(sd->down.history[0]) * 60);
#ifdef EVTIME
sd->down.history[0].timestamp = ev->timestamp / 1000.0;
sd->down.history[0].x = ev->canvas.x;
sd->down.history[0].y = ev->canvas.y;
}
- sd->down.dragged_began = 0;
- sd->down.hold_parent = 0;
- sd->down.cancelled = 0;
- if(sd->hold || sd->freeze)
- sd->down.want_reset = 1;
+ sd->down.dragged_began = EINA_FALSE;
+ sd->down.hold_parent = EINA_FALSE;
+ sd->down.cancelled = EINA_FALSE;
+ if (sd->hold || sd->freeze)
+ sd->down.want_reset = EINA_TRUE;
else
- sd->down.want_reset = 0;
+ sd->down.want_reset = EINA_FALSE;
}
}
sd->pan_func.min_get(sd->pan_obj, &minx, &miny);
if (*x < minx)
- *x += (minx - *x) * _elm_config->thumbscroll_border_friction;
+ *x += (minx - *x) * _elm_config->thumbscroll_border_friction;
else if (sd->child.w <= sd->w)
- *x += (sd->down.sx - *x) * _elm_config->thumbscroll_border_friction;
+ *x += (sd->down.sx - *x) * _elm_config->thumbscroll_border_friction;
else if ((sd->child.w - sd->w + minx) < *x)
- *x += (sd->child.w - sd->w + minx - *x) *
- _elm_config->thumbscroll_border_friction;
+ *x += (sd->child.w - sd->w + minx - *x) *
+ _elm_config->thumbscroll_border_friction;
if (*y < miny)
- *y += (miny - *y) * _elm_config->thumbscroll_border_friction;
+ *y += (miny - *y) * _elm_config->thumbscroll_border_friction;
else if (sd->child.h <= sd->h)
- *y += (sd->down.sy - *y) * _elm_config->thumbscroll_border_friction;
+ *y += (sd->down.sy - *y) * _elm_config->thumbscroll_border_friction;
else if ((sd->child.h - sd->h + miny) < *y)
- *y += (sd->child.h - sd->h + miny - *y) *
- _elm_config->thumbscroll_border_friction;
+ *y += (sd->child.h - sd->h + miny - *y) *
+ _elm_config->thumbscroll_border_friction;
}
static Eina_Bool
fx = sd->down.hold_x;
fy = sd->down.hold_y;
- if ((!sd->hold) && (!sd->freeze) && (_elm_config->scroll_smooth_time_interval > 0.0))
- {
- int i, count = 0; //count for the real event number we have to deal with
- int queue_size = 10; //for event queue size
- int src_index = 0, dst_index = 0;
- int xsum = 0, ysum=0;
- Evas_Coord x=0, y=0;
-
- struct {
- Evas_Coord x, y;
- double t;
- } pos[queue_size];
-
- double tdiff, tnow;
- double time_interval=_elm_config->scroll_smooth_time_interval;
- // FIXME: assume server and client have the same "timezone"
- // (0 timepoint) for now. this needs to be figured out in advance
- // though.
- tdiff = sd->down.hist.est_timestamp_diff;
- tnow = ecore_time_get() - tdiff;
-
- for(i = 0; i < queue_size; i++)
- {
- x = sd->down.history[i].x;
- y = sd->down.history[i].y;
-
- //if there is no history value , we don't deal with it
- //if there is better wat to know existance of history value , I will modify this code to it
- if ( (x == 0) && (y == 0) )
- {
- break;
- }
- _down_coord_eval(sd, &x, &y);
-
- pos[i].x = x;
- pos[i].y = y;
- pos[i].t = tnow - sd->down.history[i].timestamp;
- }
- count = --i;
-
- // we only deal with smooth scroll there is enough history
- for(i = 0; i < queue_size; i++)
- {
- if (src_index > count) break;
- if (i == 0)
- {
- xsum = pos[i].x;
- ysum = pos[i].y;
- dst_index++;
- continue;
- }
- while ((pos[src_index].t < time_interval *i) &&
- (src_index <= count))
- {
- src_index++;
- }
- if (src_index <= count)
- {
- xsum += pos[src_index].x;
- ysum += pos[src_index].y;
- dst_index++;
- }
- }
- fx = xsum / dst_index;
- fy = ysum / dst_index;
- }
-
elm_smart_scroller_child_pos_get(sd->smart_obj, &ox, &oy);
if (sd->down.dir_x)
{
if ((!sd->widget) ||
(!elm_widget_drag_child_locked_x_get(sd->widget)))
- {
- ox = fx;
- }
+ ox = fx;
}
if (sd->down.dir_y)
{
if ((!sd->widget) ||
(!elm_widget_drag_child_locked_y_get(sd->widget)))
- {
- oy = fy;
- }
+ oy = fy;
}
+
elm_smart_scroller_child_pos_set(sd->smart_obj, ox, oy);
return ECORE_CALLBACK_RENEW;
}
sd = data;
ev = event_info;
- sd->down.hold_parent = 0;
+ sd->down.hold_parent = EINA_FALSE;
+ sd->down.dx = 0;
+ sd->down.dy = 0;
// if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ;
evas_post_event_callback_push(e, _smart_event_post_up, sd);
// FIXME: respect elm_widget_scroll_hold_get of parent container
{
ecore_animator_del(sd->down.onhold_animator);
sd->down.onhold_animator = NULL;
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
}
x = ev->canvas.x - sd->down.x;
y = ev->canvas.y - sd->down.y;
ax /= (i + 1);
ay /= (i + 1);
at /= (i + 1);
- at *= 4.0; // magic number! just trial and error shows this makes it behave "nicer" and not run off at high speed all the time
+ at /= _elm_config->thumbscroll_sensitivity_friction;
dx = ev->canvas.x - ax;
dy = ev->canvas.y - ay;
if (at > 0)
((sd->down.dy > 0) && (sd->down.pdy > 0)) ||
((sd->down.dy < 0) && (sd->down.pdy < 0)))
{
- double t = ecore_loop_time_get();
- double dt = t - sd->down.anim_start;
+ double tt = ecore_loop_time_get();
+ double dtt = tt - sd->down.anim_start;
- if (dt < 0.0) dt = 0.0;
- else if (dt > _elm_config->thumbscroll_friction)
- dt = _elm_config->thumbscroll_friction;
- sd->down.extra_time = _elm_config->thumbscroll_friction - dt;
+ if (dtt < 0.0) dtt = 0.0;
+ else if (dtt > _elm_config->thumbscroll_friction)
+ dtt = _elm_config->thumbscroll_friction;
+ sd->down.extra_time = _elm_config->thumbscroll_friction - dtt;
}
else
sd->down.extra_time = 0.0;
}
}
}
- if (sd->down.hold_animator)
- {
- ecore_animator_del(sd->down.hold_animator);
- sd->down.hold_animator = NULL;
- }
}
else
{
if (pgy != y) _smart_scrollto_y(sd, _elm_config->page_scroll_friction, pgy);
}
}
- if (sd->down.hold_animator)
- {
- ecore_animator_del(sd->down.hold_animator);
- sd->down.hold_animator = NULL;
- }
+ }
+ if (sd->down.hold_animator)
+ {
+ ecore_animator_del(sd->down.hold_animator);
+ sd->down.hold_animator = NULL;
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
}
if (sd->down.scroll)
{
ev->event_flags |= EVAS_EVENT_FLAG_ON_SCROLL;
- sd->down.scroll = 0;
+ sd->down.scroll = EINA_FALSE;
}
if (sd->down.hold)
{
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
- sd->down.hold = 0;
+ sd->down.hold = EINA_FALSE;
}
- sd->down.dragged_began = 0;
- sd->down.dir_x = 0;
- sd->down.dir_y = 0;
- sd->down.want_dragged = 0;
- sd->down.dragged = 0;
- sd->down.now = 0;
+ sd->down.dragged_began = EINA_FALSE;
+ sd->down.dir_x = EINA_FALSE;
+ sd->down.dir_y = EINA_FALSE;
+ sd->down.want_dragged = EINA_FALSE;
+ sd->down.dragged = EINA_FALSE;
+ sd->down.now = EINA_FALSE;
elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
elm_smart_scroller_child_pos_set(sd->smart_obj, x, y);
_update_wanted_coordinates(sd, x, y);
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
+
if (!_smart_do_page(sd))
bounce_eval(sd);
}
{
if ((sd->down.dir_x) && !can_scroll(sd, sd->down.hdir))
{
- sd->down.dir_x = 0;
+ sd->down.dir_x = EINA_FALSE;
}
if ((sd->down.dir_y) && !can_scroll(sd, sd->down.vdir))
{
- sd->down.dir_y = 0;
+ sd->down.dir_y = EINA_FALSE;
}
}
if (sd->down.dir_x)
if ((!sd->widget) ||
(!elm_widget_drag_child_locked_x_get(sd->widget)))
{
- sd->down.want_dragged = 0;
- sd->down.dragged = 1;
+ sd->down.want_dragged = EINA_FALSE;
+ sd->down.dragged = EINA_TRUE;
if (sd->widget)
{
elm_widget_drag_lock_x_set(sd->widget, 1);
start = 1;
}
else
- sd->down.dir_x = 0;
+ sd->down.dir_x = EINA_FALSE;
}
if (sd->down.dir_y)
{
if ((!sd->widget) ||
(!elm_widget_drag_child_locked_y_get(sd->widget)))
{
- sd->down.want_dragged = 0;
- sd->down.dragged = 1;
+ sd->down.want_dragged = EINA_FALSE;
+ sd->down.dragged = EINA_TRUE;
if (sd->widget)
{
elm_widget_drag_lock_y_set(sd->widget, 1);
start = 1;
}
else
- sd->down.dir_y = 0;
+ sd->down.dir_y = EINA_FALSE;
}
if ((!sd->down.dir_x) && (!sd->down.dir_y))
{
- sd->down.cancelled = 1;
+ sd->down.cancelled = EINA_TRUE;
}
if (start) _smart_drag_start(sd->smart_obj);
}
sd = data;
ev = event_info;
// if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ;
- if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) sd->down.hold_parent = 1;
+ if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
+ sd->down.hold_parent = EINA_TRUE;
evas_post_event_callback_push(e, _smart_event_post_move, sd);
+
// FIXME: respect elm_widget_scroll_hold_get of parent container
if (_elm_config->thumbscroll_enable)
{
{
int dodir = 0;
+ if ((sd->scrollto.x.animator) && (!sd->hold) && (!sd->freeze))
+ {
+ Evas_Coord px;
+ ecore_animator_del(sd->scrollto.x.animator);
+ sd->scrollto.x.animator = NULL;
+ sd->pan_func.get(sd->pan_obj, &px, NULL);
+ sd->down.sx = px;
+ sd->down.x = sd->down.history[0].x;
+ }
+
+ if ((sd->scrollto.y.animator) && (!sd->hold) && (!sd->freeze))
+ {
+ Evas_Coord py;
+ ecore_animator_del(sd->scrollto.y.animator);
+ sd->scrollto.y.animator = NULL;
+ sd->pan_func.get(sd->pan_obj, NULL, &py);
+ sd->down.sy = py;
+ sd->down.y = sd->down.history[0].y;
+ }
+
#ifdef SCROLLDBG
printf("::: %i %i\n", ev->cur.canvas.x, ev->cur.canvas.y);
#endif
{
if (x > (y * 2))
{
- sd->down.dir_x = 1;
- sd->down.dir_y = 0;
+ sd->down.dir_x = EINA_TRUE;
+ sd->down.dir_y = EINA_FALSE;
dodir++;
}
}
{
if (y > (x * 2))
{
- sd->down.dir_x = 0;
- sd->down.dir_y = 1;
+ sd->down.dir_x = EINA_FALSE;
+ sd->down.dir_y = EINA_TRUE;
dodir++;
}
}
if (!dodir)
{
- sd->down.dir_x = 1;
- sd->down.dir_y = 1;
+ sd->down.dir_x = EINA_TRUE;
+ sd->down.dir_y = EINA_TRUE;
}
}
else
{
- // can_scroll(sd, LEFT);
- // can_scroll(sd, RIGHT);
- // can_scroll(sd, UP);
- // can_scroll(sd, DOWN);
- sd->down.dir_x = 1;
- sd->down.dir_y = 1;
+ sd->down.dir_x = EINA_TRUE;
+ sd->down.dir_y = EINA_TRUE;
}
}
if ((!sd->hold) && (!sd->freeze))
(_elm_config->thumbscroll_threshold *
_elm_config->thumbscroll_threshold)))
{
- sd->down.dragged_began = 1;
+ sd->down.dragged_began = EINA_TRUE;
if (!sd->down.dragged)
{
- sd->down.want_dragged = 1;
+ sd->down.want_dragged = EINA_TRUE;
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
// evas_event_feed_hold(e, 1, ev->timestamp, ev->data);
// _smart_drag_start(sd->smart_obj);
y = sd->down.sy - (ev->cur.canvas.y - sd->down.y);
else
y = sd->down.sy;
- if(sd->down.want_reset)
+ if (sd->down.want_reset)
{
sd->down.x = ev->cur.canvas.x;
sd->down.y = ev->cur.canvas.y;
- sd->down.want_reset = 0;
+ sd->down.want_reset = EINA_FALSE;
}
if ((sd->down.dir_x) || (sd->down.dir_y))
{
{
sd->down.locked_x = x;
sd->down.locked_y = y;
- sd->down.locked = 1;
+ sd->down.locked = EINA_TRUE;
}
if (!((sd->down.dir_x) && (sd->down.dir_y)))
{
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
if (!sd->down.hold)
{
- sd->down.hold = 1;
+ sd->down.hold = EINA_TRUE;
evas_event_feed_hold(e, 1, ev->timestamp, ev->data);
}
}
{
ecore_animator_del(sd->down.onhold_animator);
sd->down.onhold_animator = NULL;
+ if (sd->child.resized)
+ _elm_smart_scroller_wanted_region_set(sd->smart_obj);
}
}
}
Evas_Coord x, y, mx = 0, my = 0, px, py, minx = 0, miny = 0;
double vx, vy;
+ if ((sd->down.dragged) || (sd->down.bounce_x_animator)
+ || (sd->down.bounce_y_animator) || (sd->down.momentum_animator)
+ || (sd->scrollto.x.animator) || (sd->scrollto.y.animator))
+ return;
edje_object_part_drag_value_get(sd->edje_obj, "elm.dragable.vbar", NULL, &vy);
edje_object_part_drag_value_get(sd->edje_obj, "elm.dragable.hbar", &vx, NULL);
sd->pan_func.max_get(sd->pan_obj, &mx, &my);
if (h <= vh)
{
scroll_v_vis_change = 1;
- sd->vbar_visible = 0;
+ sd->vbar_visible = EINA_FALSE;
}
}
else
{
scroll_v_vis_change = 1;
- sd->vbar_visible = 0;
+ sd->vbar_visible = EINA_FALSE;
}
}
else if (sd->vbar_flags == ELM_SMART_SCROLLER_POLICY_OFF)
{
scroll_v_vis_change = 1;
- sd->vbar_visible = 0;
+ sd->vbar_visible = EINA_FALSE;
}
}
else
if (h > vh)
{
scroll_v_vis_change = 1;
- sd->vbar_visible = 1;
+ sd->vbar_visible = EINA_TRUE;
}
}
}
else if (sd->vbar_flags == ELM_SMART_SCROLLER_POLICY_ON)
{
scroll_v_vis_change = 1;
- sd->vbar_visible = 1;
+ sd->vbar_visible = EINA_TRUE;
}
}
if (scroll_v_vis_change)
if (w <= vw)
{
scroll_h_vis_change = 1;
- sd->hbar_visible = 0;
+ sd->hbar_visible = EINA_FALSE;
}
}
else
{
scroll_h_vis_change = 1;
- sd->hbar_visible = 0;
+ sd->hbar_visible = EINA_FALSE;
}
}
else if (sd->hbar_flags == ELM_SMART_SCROLLER_POLICY_OFF)
{
scroll_h_vis_change = 1;
- sd->hbar_visible = 0;
+ sd->hbar_visible = EINA_FALSE;
}
}
else
if (w > vw)
{
scroll_h_vis_change = 1;
- sd->hbar_visible = 1;
+ sd->hbar_visible = EINA_TRUE;
}
}
}
else if (sd->hbar_flags == ELM_SMART_SCROLLER_POLICY_ON)
{
scroll_h_vis_change = 1;
- sd->hbar_visible = 1;
+ sd->hbar_visible = EINA_TRUE;
}
}
if (scroll_h_vis_change)
evas_object_move(sd->event_obj, sd->x, sd->y);
evas_object_resize(sd->event_obj, sd->w, sd->h);
_smart_scrollbar_size_adjust(sd);
+ _smart_page_adjust(sd);
}
static void
sd->page.y = -50;
sd->hbar_flags = ELM_SMART_SCROLLER_POLICY_AUTO;
sd->vbar_flags = ELM_SMART_SCROLLER_POLICY_AUTO;
- sd->hbar_visible = 1;
- sd->vbar_visible = 1;
+ sd->hbar_visible = EINA_TRUE;
+ sd->vbar_visible = EINA_TRUE;
- sd->bounce_horiz = 1;
- sd->bounce_vert = 1;
+ sd->bounce_horiz = EINA_TRUE;
+ sd->bounce_vert = EINA_TRUE;
- sd->one_dir_at_a_time = 1;
+ sd->one_dir_at_a_time = EINA_TRUE;
sd->momentum_animator_disabled = EINA_FALSE;
sd->bounce_animator_disabled = EINA_FALSE;
sd->edje_obj = o;
elm_smart_scroller_object_theme_set(NULL, obj, "scroller", "base", "default");
edje_object_signal_callback_add(o, "drag", "elm.dragable.vbar", _smart_edje_drag_v, sd);
+ edje_object_signal_callback_add(o, "drag,set", "elm.dragable.vbar", _smart_edje_drag_v, sd);
edje_object_signal_callback_add(o, "drag,start", "elm.dragable.vbar", _smart_edje_drag_v_start, sd);
edje_object_signal_callback_add(o, "drag,stop", "elm.dragable.vbar", _smart_edje_drag_v_stop, sd);
edje_object_signal_callback_add(o, "drag,step", "elm.dragable.vbar", _smart_edje_drag_v, sd);
edje_object_signal_callback_add(o, "drag,page", "elm.dragable.vbar", _smart_edje_drag_v, sd);
edje_object_signal_callback_add(o, "drag", "elm.dragable.hbar", _smart_edje_drag_h, sd);
+ edje_object_signal_callback_add(o, "drag,set", "elm.dragable.hbar", _smart_edje_drag_h, sd);
edje_object_signal_callback_add(o, "drag,start", "elm.dragable.hbar", _smart_edje_drag_h_start, sd);
edje_object_signal_callback_add(o, "drag,stop", "elm.dragable.hbar", _smart_edje_drag_h_stop, sd);
edje_object_signal_callback_add(o, "drag,step", "elm.dragable.hbar", _smart_edje_drag_h, sd);
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;
_smart_scrollbar_reset(sd);
}
projects / framework / uifw / elementary.git / blobdiff