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;
- 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;
- } 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;
+ } 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;
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))
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))
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 = EINA_FALSE;
}
}
fx = sd->down.hold_x;
fy = sd->down.hold_y;
- if (_elm_config->scroll_smooth_amount > 0.0)
- {
- int i, count = 0;
- Evas_Coord basex = 0, basey = 0, x, y;
- double dt, t, tdiff, tnow, twin;
- struct {
- Evas_Coord x, y, dx, dy;
- double t, dt;
- } pos[60];
-
- tdiff = sd->down.hist.est_timestamp_diff;
- tnow = ecore_time_get() - tdiff;
- t = tnow;
- twin = _elm_config->scroll_smooth_time_window;
- for (i = 0; i < 60; i++)
- {
- // oldest point is sd->down.history[i]
- // newset is sd->down.history[0]
- dt = t - sd->down.history[i].timestamp;
- if (dt > twin)
- {
- i--;
- break;
- }
- x = sd->down.history[i].x;
- y = sd->down.history[i].y;
- _down_coord_eval(sd, &x, &y);
- if (i == 0)
- {
- basex = x;
- basey = y;
- }
- pos[i].x = x - basex;
- pos[i].y = y - basey;
- pos[i].t =
- sd->down.history[i].timestamp - sd->down.history[0].timestamp;
- count++;
- }
- count = i;
- if (count >= 2)
- {
- double dtsum = 0.0, tadd, maxdt;
- double dxsum = 0.0, dysum = 0.0, xsum = 0.0, ysum = 0.0;
-
- for (i = 0; i < (count - 1); i++)
- {
- pos[i].dx = pos[i].x - pos[i + 1].x;
- pos[i].dy = pos[i].y - pos[i + 1].y;
- pos[i].dt = pos[i].t - pos[i + 1].t;
- dxsum += pos[i].dx;
- dysum += pos[i].dy;
- dtsum += pos[i].dt;
- xsum += pos[i].x;
- ysum += pos[i].y;
- }
- maxdt = pos[i].t;
- dxsum /= (double)i;
- dysum /= (double)i;
- dtsum /= (double)i;
- xsum /= (double)i;
- ysum /= (double)i;
- tadd = tnow - sd->down.history[0].timestamp + _elm_config->scroll_smooth_future_time;
- tadd = tadd - (maxdt / 2);
-#define WEIGHT(n, o, v) n = (((double)o * (1.0 - v)) + ((double)n * v))
- WEIGHT(tadd, sd->down.hist.tadd, _elm_config->scroll_smooth_history_weight);
- WEIGHT(dxsum, sd->down.hist.dxsum, _elm_config->scroll_smooth_history_weight);
- WEIGHT(dysum, sd->down.hist.dysum, _elm_config->scroll_smooth_history_weight);
- fx = basex + xsum + ((dxsum * tadd) / dtsum);
- fy = basey + ysum + ((dysum * tadd) / dtsum);
- sd->down.hist.tadd = tadd;
- sd->down.hist.dxsum = dxsum;
- sd->down.hist.dysum = dysum;
- WEIGHT(fx, sd->down.hold_x, _elm_config->scroll_smooth_amount);
- WEIGHT(fy, sd->down.hold_y, _elm_config->scroll_smooth_amount);
- }
- // printf("%3.5f %i %i\n", ecore_time_get(), sd->down.hold_y, fy);
- }
elm_smart_scroller_child_pos_get(sd->smart_obj, &ox, &oy);
if (sd->down.dir_x)
Evas_Event_Mouse_Down *ev;
Smart_Data *sd;
Evas_Coord x = 0, y = 0, ox = 0, oy = 0;
+ Evas_Coord vw, vh, aw, ah;
sd = data;
ev = event_info;
}
else
sd->down.extra_time = 0.0;
+ elm_smart_scroller_child_viewport_size_get(sd->smart_obj, &vw, &vh);
+ aw = abs(sd->down.dx);
+ if (aw > vw*3)
+ {
+ if (sd->down.dx > 0) sd->down.dx = vw*3;
+ else sd->down.dx = -(vw*3);
+ }
+ ah = abs(sd->down.dy);
+ if (ah > vh*3)
+ {
+ if (sd->down.dy > 0) sd->down.dy = vh*3;
+ else sd->down.dy = -(vh*3);
+ }
sd->down.pdx = sd->down.dx;
sd->down.pdy = sd->down.dy;
ox = -sd->down.dx;
{
int dodir = 0;
- if (sd->scrollto.x.animator)
+ if ((sd->scrollto.x.animator) && (!sd->hold) && (!sd->freeze))
{
Evas_Coord px;
ecore_animator_del(sd->scrollto.x.animator);
sd->down.x = sd->down.history[0].x;
}
- if (sd->scrollto.y.animator)
+ if ((sd->scrollto.y.animator) && (!sd->hold) && (!sd->freeze))
{
Evas_Coord py;
ecore_animator_del(sd->scrollto.y.animator);
y = sd->down.sy - (ev->cur.canvas.y - sd->down.y);
else
y = sd->down.sy;
+ if (sd->down.want_reset)
+ {
+ sd->down.x = ev->cur.canvas.x;
+ sd->down.y = ev->cur.canvas.y;
+ sd->down.want_reset = EINA_FALSE;
+ }
if ((sd->down.dir_x) || (sd->down.dir_y))
{
if (!sd->down.locked)
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