Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow parent to intercept touch events in case vertical scroll edge flags are set #742

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Allow parent to intercept touch events in case vertical scroll edge flags are set #742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1f9d00
Allow parent to intercept touch events in case vertical scroll edge f…
bojankseneman Feb 12, 2020
fd3e500
Make parent scroll direction configurable
bojankseneman Feb 14, 2020
6b90aaf
Set the variable when set is invoked
bojankseneman Feb 14, 2020
7d26ad9
Merge branch 'master' of https://github.com/chrisbanes/PhotoView
bojankseneman Apr 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions photoview/src/main/java/com/github/chrisbanes/photoview/ParentScrollDirection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.github.chrisbanes.photoview;

public @interface ParentScrollDirection {
int HORIZONTAL = 0;
int VERTICAL = 1;
}
4 changes: 4 additions & 0 deletions photoview/src/main/java/com/github/chrisbanes/photoview/PhotoView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,4 +253,8 @@ public void setOnScaleChangeListener(OnScaleChangedListener onScaleChangedListen
public void setOnSingleFlingListener(OnSingleFlingListener onSingleFlingListener) {
attacher.setOnSingleFlingListener(onSingleFlingListener);
}

public void setParentScrollDirection(@ParentScrollDirection int scrollDirection) {
attacher.setParentScrollDirection(scrollDirection);
}
}
8 changes: 7 additions & 1 deletion photoview/src/main/java/com/github/chrisbanes/photoview/PhotoViewAttacher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ public class PhotoViewAttacher implements View.OnTouchListener,
private FlingRunnable mCurrentFlingRunnable;
private int mHorizontalScrollEdge = HORIZONTAL_EDGE_BOTH;
private int mVerticalScrollEdge = VERTICAL_EDGE_BOTH;
private int mParentScrollDirection = ParentScrollDirection.HORIZONTAL;
private float mBaseRotation;

private boolean mZoomEnabled = true;
Expand Down Expand Up @@ -118,9 +119,10 @@ public void onDrag(float dx, float dy) {
*/
ViewParent parent = mImageView.getParent();
if (mAllowParentInterceptOnEdge && !mScaleDragDetector.isScaling() && !mBlockParentIntercept) {
if (mHorizontalScrollEdge == HORIZONTAL_EDGE_BOTH
if ((mHorizontalScrollEdge == HORIZONTAL_EDGE_BOTH && mParentScrollDirection == ParentScrollDirection.HORIZONTAL)
|| (mHorizontalScrollEdge == HORIZONTAL_EDGE_LEFT && dx >= 1f)
|| (mHorizontalScrollEdge == HORIZONTAL_EDGE_RIGHT && dx <= -1f)
|| (mVerticalScrollEdge == VERTICAL_EDGE_BOTH && mParentScrollDirection == ParentScrollDirection.VERTICAL)
|| (mVerticalScrollEdge == VERTICAL_EDGE_TOP && dy >= 1f)
|| (mVerticalScrollEdge == VERTICAL_EDGE_BOTTOM && dy <= -1f)) {
if (parent != null) {
Expand Down Expand Up @@ -260,6 +262,10 @@ public void setOnSingleFlingListener(OnSingleFlingListener onSingleFlingListener
this.mSingleFlingListener = onSingleFlingListener;
}

public void setParentScrollDirection(@ParentScrollDirection int scrollDirection) {
this.mParentScrollDirection = scrollDirection;
}

@Deprecated
public boolean isZoomEnabled() {
return mZoomEnabled;
Expand Down