Don't prevent scrolling in CoverView when an bitmap has not yet been loaded

This commit is contained in:
Christopher Eby 2010-04-24 13:29:10 -05:00
parent 88784789ca
commit 6cd2b5c7a2

View File

@ -479,11 +479,11 @@ public final class CoverView extends View {
mLastMotionX = x; mLastMotionX = x;
if (deltaX < 0) { if (deltaX < 0) {
int availableToScroll = scrollX - (mBitmaps[0] == null || mTimelinePos == 0 ? width : 0); int availableToScroll = scrollX - (mTimelinePos == 0 ? width : 0);
if (availableToScroll > 0) if (availableToScroll > 0)
scrollBy(Math.max(-availableToScroll, deltaX), 0); scrollBy(Math.max(-availableToScroll, deltaX), 0);
} else if (deltaX > 0) { } else if (deltaX > 0) {
int availableToScroll = getWidth() * (mBitmaps[0] == null ? 1 : 2) - scrollX; int availableToScroll = getWidth() * 2 - scrollX;
if (availableToScroll > 0) if (availableToScroll > 0)
scrollBy(Math.min(availableToScroll, deltaX), 0); scrollBy(Math.min(availableToScroll, deltaX), 0);
} }