bugfix: boundary protection

Tencent · Jun 6, 2019 · 5bfd8f5 · 5bfd8f5
1 parent 8554bf6
commit 5bfd8f5
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/qmui/src/main/java/com/qmuiteam/qmui/nestedScroll/QMUIContinuousNestedScrollLayout.java b/qmui/src/main/java/com/qmuiteam/qmui/nestedScroll/QMUIContinuousNestedScrollLayout.java
@@ -252,6 +252,11 @@ public void checkLayout() {
         int topRange = mTopView.getScrollOffsetRange();
         int offsetCurrent = -mTopAreaBehavior.getTopAndBottomOffset();
         int offsetRange = getOffsetRange();
+
+        if(offsetRange <= 0){
+            return;
+        }
+
         if (offsetCurrent >= offsetRange || (offsetCurrent > 0 && mKeepBottomAreaStableWhenCheckLayout)) {
             mTopView.consumeScroll(Integer.MAX_VALUE);
             return;
@@ -388,9 +393,9 @@ public int getOffsetRange() {
         }
         int contentHeight = mBottomView.getContentHeight();
         if (contentHeight != IQMUIContinuousNestedBottomView.HEIGHT_IS_ENOUGH_TO_SCROLL) {
-            return ((View) mTopView).getHeight() - (getHeight() - contentHeight);
+            return Math.max(0, ((View) mTopView).getHeight() + contentHeight - getHeight());
         }
-        return ((View) mTopView).getHeight() - (getHeight() - ((View) mBottomView).getHeight());
+        return Math.max(0, ((View) mTopView).getHeight() + ((View) mBottomView).getHeight() - getHeight());
     }
 
     @Override