Merge pull request #214 from CsHeng/master

fix ObservableListView & ObservableGridView get the wrong scrollY when restored
ksoichiro · Oct 28, 2015 · c235e2d · c235e2d
2 parents 4d0df9d + a85c1b1
commit c235e2d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/...y/src/main/java/com/github/ksoichiro/android/observablescrollview/ObservableGridView.java b/...y/src/main/java/com/github/ksoichiro/android/observablescrollview/ObservableGridView.java
@@ -443,6 +443,7 @@ private void onScrollChanged() {
                         mPrevFirstVisibleChildHeight = firstVisibleChild.getHeight();
                     } else if (firstVisiblePosition == 0) {
                         mPrevFirstVisibleChildHeight = firstVisibleChild.getHeight();
+                        mPrevScrolledChildrenHeight = 0;
                     }
                     if (mPrevFirstVisibleChildHeight < 0) {
                         mPrevFirstVisibleChildHeight = 0;

diff --git a/...y/src/main/java/com/github/ksoichiro/android/observablescrollview/ObservableListView.java b/...y/src/main/java/com/github/ksoichiro/android/observablescrollview/ObservableListView.java
@@ -317,6 +317,7 @@ private void onScrollChanged() {
                         mPrevFirstVisibleChildHeight = firstVisibleChild.getHeight();
                     } else if (firstVisiblePosition == 0) {
                         mPrevFirstVisibleChildHeight = firstVisibleChild.getHeight();
+                        mPrevScrolledChildrenHeight = 0;
                     }
                     if (mPrevFirstVisibleChildHeight < 0) {
                         mPrevFirstVisibleChildHeight = 0;