Bug 711071 - Check for scrollable in velocity calculations. r=pcwalton

This commit is contained in:
Wes Johnston 2012-01-28 18:23:45 +01:00
parent e281ebf836
commit cc5c466908

View File

@ -190,7 +190,7 @@ abstract class Axis {
/* Returns the velocity. If the axis is locked, returns 0. */
float getRealVelocity() {
return mLocked ? 0.0f : mVelocity;
return (mLocked || !scrollable()) ? 0.0f : mVelocity;
}
void startPan() {