Skip to content

Commit 1ed0198

Browse files
committed
1 parent c0d5737 commit 1ed0198

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

library/src/main/java/com/daimajia/swipe/SwipeLayout.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,11 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
682682
* @return
683683
*/
684684
private View childNeed(ViewGroup v, MotionEvent event){
685+
if(v == null) return null;
686+
687+
if(v.onTouchEvent(event))
688+
return v;
689+
685690
int childCount = v.getChildCount();
686691
for(int i = childCount - 1; i >= 0; i--){
687692
View child = v.getChildAt(i);
@@ -704,6 +709,8 @@ private View childNeed(ViewGroup v, MotionEvent event){
704709
* @return
705710
*/
706711
private boolean childNeed(View v, MotionEvent event){
712+
if(v == null) return false;
713+
707714
if(event.getX() > v.getLeft() && event.getX() < v.getRight()
708715
&& event.getY() > v.getTop() && event.getY() < v.getBottom()){
709716
return v.onTouchEvent(event);

0 commit comments

Comments
 (0)