dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elm/scrollable: Avoid division by zero during scroll. 

When several mouse move events arrive with the same timestamps, the
calculation done to get an average of movement will try to divide things
by zero. This fix will make it ignore this calculation and just go back
to assuming that there's only one last move event.

Such behavior can happen on wayland backend, when using the X11 backend
for Weston, since it will process several X events in one loop iteration
and send all of them with the same timestamp.
This commit is contained in:
Rafael Antognolli 2013-06-05 19:14:59 -03:00
parent 14cc29a188
commit cc19e3948d
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
legacy/elementary/src/lib/elm_interface_scrollable.c
View File

@ -2898,21 +2898,24 @@ _elm_scroll_hold_animator(void *data)
dxsum /= (double)i;
dysum /= (double)i;
dtsum /= (double)i;
xsum /= (double)i;
ysum /= (double)i;
tadd = tnow - sid->down.history[0].timestamp + _elm_config->scroll_smooth_future_time;
tadd = tadd - (maxdt / 2);
if (dtsum > 0)
{
xsum /= (double)i;
ysum /= (double)i;
tadd = tnow - sid->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, sid->down.hist.tadd, _elm_config->scroll_smooth_history_weight);
WEIGHT(dxsum, sid->down.hist.dxsum, _elm_config->scroll_smooth_history_weight);
WEIGHT(dysum, sid->down.hist.dysum, _elm_config->scroll_smooth_history_weight);
fx = basex + xsum + ((dxsum * tadd) / dtsum);
fy = basey + ysum + ((dysum * tadd) / dtsum);
sid->down.hist.tadd = tadd;
sid->down.hist.dxsum = dxsum;
sid->down.hist.dysum = dysum;
WEIGHT(fx, sid->down.hold_x, _elm_config->scroll_smooth_amount);
WEIGHT(fy, sid->down.hold_y, _elm_config->scroll_smooth_amount);
WEIGHT(tadd, sid->down.hist.tadd, _elm_config->scroll_smooth_history_weight);
WEIGHT(dxsum, sid->down.hist.dxsum, _elm_config->scroll_smooth_history_weight);
WEIGHT(dysum, sid->down.hist.dysum, _elm_config->scroll_smooth_history_weight);
fx = basex + xsum + ((dxsum * tadd) / dtsum);
fy = basey + ysum + ((dysum * tadd) / dtsum);
sid->down.hist.tadd = tadd;
sid->down.hist.dxsum = dxsum;
sid->down.hist.dysum = dysum;
WEIGHT(fx, sid->down.hold_x, _elm_config->scroll_smooth_amount);
WEIGHT(fy, sid->down.hold_y, _elm_config->scroll_smooth_amount);
}
}
}