Merge pull request liaohuqiu#50 from jw2013/fix-bug

should check against scrollHeight on deciding scrollback
examine928 · Feb 7, 2015 · 965f153 · 965f153
2 parents 7c98864 + c5d1c84
commit 965f153
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ptr-lib/src/in/srain/cube/views/ptr/PtrFrameLayout.java b/ptr-lib/src/in/srain/cube/views/ptr/PtrFrameLayout.java
@@ -435,9 +435,9 @@ private void onRelease(boolean stayForLoading) {
         if (mStatus == PTR_STATUS_LOADING) {
             // keep header for fresh
             if (mKeepHeaderWhenRefresh) {
+                int scrollHeight = mHeaderRetainHeightOnRefresh >= 0 ? mHeaderRetainHeightOnRefresh : mHeaderHeight;
                 // scroll header back
-                if (mCurrentPos > mHeaderHeight && !stayForLoading) {
-                	int scrollHeight = mHeaderRetainHeightOnRefresh >= 0 ? mHeaderRetainHeightOnRefresh : mHeaderHeight;
+                if (mCurrentPos > scrollHeight && !stayForLoading) {
                     mScrollChecker.tryToScrollTo(scrollHeight, mDurationToClose);
                 } else {
                     // do nothing