From 7ba5e8b350addf8ed7ec32e7478ea72904871a15 Mon Sep 17 00:00:00 2001 From: daimajia Date: Tue, 16 Sep 2014 09:44:30 +0800 Subject: [PATCH] better selector effect --- gradle.properties | 4 ++-- library/src/main/java/com/daimajia/swipe/SwipeLayout.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7433d30..0e86152 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,8 +18,8 @@ # org.gradle.parallel=true -VERSION_NAME=1.1.0 -VERSION_CODE=11 +VERSION_NAME=1.1.1 +VERSION_CODE=12 GROUP=com.daimajia.swipelayout ANDROID_BUILD_MIN_SDK_VERSION=8 diff --git a/library/src/main/java/com/daimajia/swipe/SwipeLayout.java b/library/src/main/java/com/daimajia/swipe/SwipeLayout.java index a53048c..6388a3b 100644 --- a/library/src/main/java/com/daimajia/swipe/SwipeLayout.java +++ b/library/src/main/java/com/daimajia/swipe/SwipeLayout.java @@ -768,9 +768,6 @@ public class SwipeLayout extends FrameLayout { return true; } - if(touching != null) - touching.setPressed(false); - float distanceX = event.getRawX() - sX; float distanceY = event.getRawY() - sY; float angle = Math.abs(distanceY / distanceX); @@ -817,6 +814,9 @@ public class SwipeLayout extends FrameLayout { parent.requestDisallowInterceptTouchEvent(false); return false; }else{ + if(touching != null){ + touching.setPressed(false); + } parent.requestDisallowInterceptTouchEvent(true); mDragHelper.processTouchEvent(event); }