From ea3801318274b17e2e9a51c31b0df9b1a1d52c89 Mon Sep 17 00:00:00 2001 From: Durk-jae Yun Date: Sat, 20 Apr 2019 22:01:58 +0900 Subject: [PATCH] Resolve the problem of displaying a refresh layout when dragging from non-top to bottom of a target. --- .../java/com/lovejjfg/powerrefresh/PowerRefreshLayout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/powerrefresh/src/main/java/com/lovejjfg/powerrefresh/PowerRefreshLayout.java b/powerrefresh/src/main/java/com/lovejjfg/powerrefresh/PowerRefreshLayout.java index d845b7d..48386ba 100644 --- a/powerrefresh/src/main/java/com/lovejjfg/powerrefresh/PowerRefreshLayout.java +++ b/powerrefresh/src/main/java/com/lovejjfg/powerrefresh/PowerRefreshLayout.java @@ -414,7 +414,7 @@ public boolean onInterceptTouchEvent(MotionEvent ev) { int pointerIndex; - if (!isEnabled() || isRefreshing || isLoading || !canChildScrollUp() + if (!isEnabled() || isRefreshing || isLoading || canChildScrollUp() || mNestedScrollInProgress) { // Fail fast if we're not in a state where a swipe is possible return false; @@ -461,7 +461,7 @@ public boolean onTouchEvent(MotionEvent ev) { int pointerIndex; - if (!isEnabled() || !canChildScrollUp() + if (!isEnabled() || canChildScrollUp() || isLoading || isRefreshing || mNestedScrollInProgress) { // Fail fast if we're not in a state where a swipe is possible return false;