Improve code to determine which pages are visible
Change-Id: I2c349d987ddb5f399283088c128e6d4d056da4da
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index a615b59..e64b0c3 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -717,14 +717,18 @@
final int screenWidth = getMeasuredWidth();
int leftScreen = 0;
int rightScreen = 0;
+ View currPage = getPageAt(leftScreen);
while (leftScreen < pageCount - 1 &&
- getPageAt(leftScreen).getRight() <= mScrollX) {
+ currPage.getRight() - currPage.getPaddingRight() < mScrollX) {
leftScreen++;
+ currPage = getPageAt(leftScreen);
}
rightScreen = leftScreen;
+ currPage = getPageAt(rightScreen + 1);
while (rightScreen < pageCount - 1 &&
- getPageAt(rightScreen + 1).getLeft() < mScrollX + screenWidth) {
+ currPage.getLeft() + currPage.getPaddingLeft() < mScrollX + screenWidth) {
rightScreen++;
+ currPage = getPageAt(rightScreen + 1);
}
range[0] = leftScreen;
range[1] = rightScreen;