Skip to content

Commit

Permalink
Merge pull request #2 from tachikoma/master
Browse files Browse the repository at this point in the history
Resolve the problem of displaying the refresh layout when dragging from non-top to bottom of a target.
  • Loading branch information
lovejjfg committed Apr 28, 2019
2 parents 98e15a9 + ea38013 commit 2f8972e
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 2f8972e

Please sign in to comment.