less comments and cleaner code with commented out plotting debug
SVN revision: 60189
This commit is contained in:
parent
7fa8c6ff6c
commit
28ba600756
|
@ -1674,24 +1674,22 @@ _smart_hold_animator(void *data)
|
||||||
{
|
{
|
||||||
int i, count = 0;
|
int i, count = 0;
|
||||||
Evas_Coord basex, basey, x, y;
|
Evas_Coord basex, basey, x, y;
|
||||||
double dt, t, tdiff, tnow;
|
double dt, t, tdiff, tnow, twin;
|
||||||
struct {
|
struct {
|
||||||
Evas_Coord x, y, dx, dy;
|
Evas_Coord x, y, dx, dy;
|
||||||
double t, dt;
|
double t, dt;
|
||||||
} pos[60];
|
} pos[60];
|
||||||
|
|
||||||
// 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;
|
tdiff = sd->down.hist.est_timestamp_diff;
|
||||||
tnow = ecore_time_get() - tdiff;
|
tnow = ecore_time_get() - tdiff;
|
||||||
t = tnow;
|
t = tnow;
|
||||||
|
twin = _elm_config->scroll_smooth_time_window;
|
||||||
for (i = 0; i < 60; i++)
|
for (i = 0; i < 60; i++)
|
||||||
{
|
{
|
||||||
// oldest point is sd->down.history[i]
|
// oldest point is sd->down.history[i]
|
||||||
// newset is sd->down.history[0]
|
// newset is sd->down.history[0]
|
||||||
dt = t - sd->down.history[i].timestamp;
|
dt = t - sd->down.history[i].timestamp;
|
||||||
if (dt > _elm_config->scroll_smooth_time_window)
|
if (dt > twin)
|
||||||
{
|
{
|
||||||
i--;
|
i--;
|
||||||
break;
|
break;
|
||||||
|
@ -1747,6 +1745,7 @@ _smart_hold_animator(void *data)
|
||||||
WEIGHT(fx, sd->down.hold_x, _elm_config->scroll_smooth_amount);
|
WEIGHT(fx, sd->down.hold_x, _elm_config->scroll_smooth_amount);
|
||||||
WEIGHT(fy, sd->down.hold_y, _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);
|
elm_smart_scroller_child_pos_get(sd->smart_obj, &ox, &oy);
|
||||||
|
|
Loading…
Reference in New Issue