From 47f747418efa337e0fc56e10748a6a595b8974f6 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Fri, 2 Mar 2012 13:39:13 -0800
Subject: Improve code to determine which pages are visible

Change-Id: I2c349d987ddb5f399283088c128e6d4d056da4da
---
 src/com/android/launcher2/PagedView.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/com/android/launcher2')

diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index a615b59f2..e64b0c3a6 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -717,14 +717,18 @@ public abstract class PagedView extends ViewGroup {
             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;
-- 
cgit v1.2.3