gwh/LightningLauncher-TrianguloY
1
0
Fork 0
mirror of https://github.com/TrianguloY/LightningLauncher.git synced 2024-12-28 09:58:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow a container to be dragged when scrolling a child container beyond its limits

Browse source
This commit is contained in:
Pierrot 2019-01-14 08:37:11 +01:00
parent ef88259729
commit 93fd8adb43
1 changed files with 62 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
app/llx/core/src/main/java/net/pierrox/lightning_launcher/views/ItemLayout.java
View file

@ -3,8 +3,6 @@ package net.pierrox.lightning_launcher.views;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import net.pierrox.lightning_launcher.LLApp; import net.pierrox.lightning_launcher.LLApp;
import net.pierrox.lightning_launcher.configuration.GlobalConfig; import net.pierrox.lightning_launcher.configuration.GlobalConfig;
@ -2509,12 +2507,37 @@ public class ItemLayout extends ViewGroup {
if(mGrabEventTarget!=null) { if(mGrabEventTarget!=null) {
boolean res=dispatchTransformedEventToMotionTarget(mGrabEventTarget, ev, true); boolean res=dispatchTransformedEventToMotionTarget(mGrabEventTarget, ev, true);
if(mHasChildOverscrolled) {
// if overscolling has been detected in a child container, cancel the motion target
// and start using drag events for ourself (this replicate the code below for the
// move event)
mHasChildOverscrolled = false;
ev.setAction(MotionEvent.ACTION_CANCEL);
dispatchTransformedEventToMotionTarget(mGrabEventTarget, ev, false);
mMyMotionTarget=null;
mGrabEventTarget=null;
// link with drag start below
mGestureMode=GESTURE_DRAG;
mDownX=ex;
mDownY=ey;
dx=0;
dy=0;
mDragHorizontal=mChildOverscrollHorizontal;
mVelocityTracker=VelocityTracker.obtain();
mMinDragDx = -Float.MAX_VALUE;
mMaxDragDx = Float.MAX_VALUE;
mMinDragDy = -Float.MAX_VALUE;
mMaxDragDy = Float.MAX_VALUE;
} else {
if (actionCode == MotionEvent.ACTION_UP || actionCode == MotionEvent.ACTION_CANCEL) { if (actionCode == MotionEvent.ACTION_UP || actionCode == MotionEvent.ACTION_CANCEL) {
mGrabEventTarget = null; mGrabEventTarget = null;
mLastTouchedItemView = null; mLastTouchedItemView = null;
} }
return res; return res;
} }
}
@ -2945,6 +2968,7 @@ public class ItemLayout extends ViewGroup {
mGestureMode=GESTURE_SWIPE; mGestureMode=GESTURE_SWIPE;
} }
} else if((dx*dx+dy*dy)>mTouchSlopSquare) { } else if((dx*dx+dy*dy)>mTouchSlopSquare) {
// link with child overscroll management above
mGestureMode=GESTURE_DRAG; mGestureMode=GESTURE_DRAG;
mDownX=ex; mDownX=ex;
mDownY=ey; mDownY=ey;
@ -3170,6 +3194,15 @@ public class ItemLayout extends ViewGroup {
return false; return false;
} }
private boolean mHasChildOverscrolled;
private boolean mChildOverscrollHorizontal;
// called by a child item layout when it detects overscrolling
private void setChildHasOverscrolled(boolean horizontal) {
mHasChildOverscrolled = true;
mChildOverscrollHorizontal = horizontal;
}
private float mPrevTouchX; private float mPrevTouchX;
private float mPrevTouchY; private float mPrevTouchY;
@ -3250,8 +3283,28 @@ public class ItemLayout extends ViewGroup {
private float[] checkLimits(float dx, float dy) { private float[] checkLimits(float dx, float dy) {
if(mPage.config.overScrollMode==OverScrollMode.NONE) { if(mPage.config.overScrollMode==OverScrollMode.NONE) {
if(dx>mMaxDx) dx=mMaxDx; else if(dx<mMinDx) dx=mMinDx; boolean overscroll = false;
if(dy>mMaxDy) dy=mMaxDy; else if(dy<mMinDy) dy=mMinDy; if(dx>mMaxDx) {
dx=mMaxDx;
overscroll = true;
} else if(dx<mMinDx) {
dx=mMinDx;
overscroll = true;
}
if(dy>mMaxDy) {
dy=mMaxDy;
overscroll = true;
} else if(dy<mMinDy) {
dy=mMinDy;
overscroll = true;
}
if(overscroll) {
if(mOpenerItemView != null) {
// notify the parent that we overscrolled
ItemLayout parentItemLayout = mOpenerItemView.getParentItemLayout();
parentItemLayout.setChildHasOverscrolled(mDragHorizontal);
}
}
} else { } else {
if(dx>mMaxDx) { if(dx>mMaxDx) {
final float max_over=getWidth(); final float max_over=getWidth();