moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-26 06:22:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow 2 finger scrolling in relative mode

Browse Source
This commit is contained in:
Cameron Gutman 2020-11-10 15:12:17 -06:00
parent 02bfa90417
commit 829e7cf33c
1 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
app/src/main/java/com/limelight/binding/input/touch/RelativeTouchContext.java
View File

@ -18,9 +18,11 @@ public class RelativeTouchContext implements TouchContext {
private boolean cancelled; private boolean cancelled;
private boolean confirmedMove; private boolean confirmedMove;
private boolean confirmedDrag; private boolean confirmedDrag;
private boolean confirmedScroll;
private Timer dragTimer; private Timer dragTimer;
private double distanceMoved; private double distanceMoved;
private double xFactor, yFactor; private double xFactor, yFactor;
private int pointerCount;
private final NvConnection conn; private final NvConnection conn;
private final int actionIndex; private final int actionIndex;
@ -33,6 +35,8 @@ public class RelativeTouchContext implements TouchContext {
private static final int TAP_TIME_THRESHOLD = 250; private static final int TAP_TIME_THRESHOLD = 250;
private static final int DRAG_TIME_THRESHOLD = 650; private static final int DRAG_TIME_THRESHOLD = 650;
private static final int SCROLL_SPEED_DIVISOR = 20;
public RelativeTouchContext(NvConnection conn, int actionIndex, public RelativeTouchContext(NvConnection conn, int actionIndex,
int referenceWidth, int referenceHeight, View view) int referenceWidth, int referenceHeight, View view)
{ {
@ -59,8 +63,11 @@ public class RelativeTouchContext implements TouchContext {
private boolean isTap() private boolean isTap()
{ {
long timeDelta = SystemClock.uptimeMillis() - originalTouchTime; if (confirmedDrag || confirmedMove || confirmedScroll) {
return false;
}
long timeDelta = SystemClock.uptimeMillis() - originalTouchTime;
return isWithinTapBounds(lastTouchX, lastTouchY) && timeDelta <= TAP_TIME_THRESHOLD; return isWithinTapBounds(lastTouchX, lastTouchY) && timeDelta <= TAP_TIME_THRESHOLD;
} }
@ -83,13 +90,16 @@ public class RelativeTouchContext implements TouchContext {
originalTouchX = lastTouchX = eventX; originalTouchX = lastTouchX = eventX;
originalTouchY = lastTouchY = eventY; originalTouchY = lastTouchY = eventY;
originalTouchTime = SystemClock.uptimeMillis();
cancelled = confirmedDrag = confirmedMove = false;
distanceMoved = 0;
if (actionIndex == 0) { if (isNewFinger) {
// Start the timer for engaging a drag originalTouchTime = SystemClock.uptimeMillis();
startDragTimer(); cancelled = confirmedDrag = confirmedMove = confirmedScroll = false;
distanceMoved = 0;
if (actionIndex == 0) {
// Start the timer for engaging a drag
startDragTimer();
}
} }
return true; return true;
@ -183,6 +193,13 @@ public class RelativeTouchContext implements TouchContext {
} }
} }
private void checkForConfirmedScroll() {
// Enter scrolling mode if we've already left the tap zone
// and we have 2 fingers on screen. Leave scroll mode if
// we no longer have 2 fingers on screen
confirmedScroll = (actionIndex == 0 && pointerCount == 2 && confirmedMove);
}
@Override @Override
public boolean touchMoveEvent(int eventX, int eventY) public boolean touchMoveEvent(int eventX, int eventY)
{ {
@ -192,16 +209,17 @@ public class RelativeTouchContext implements TouchContext {
if (eventX != lastTouchX || eventY != lastTouchY) if (eventX != lastTouchX || eventY != lastTouchY)
{ {
checkForConfirmedMove(eventX, eventY);
checkForConfirmedScroll();
// We only send moves and drags for the primary touch point // We only send moves and drags for the primary touch point
if (actionIndex == 0) { if (actionIndex == 0) {
checkForConfirmedMove(eventX, eventY);
int deltaX = eventX - lastTouchX; int deltaX = eventX - lastTouchX;
int deltaY = eventY - lastTouchY; int deltaY = eventY - lastTouchY;
// Scale the deltas based on the factors passed to our constructor // Scale the deltas based on the factors passed to our constructor
deltaX = (int)Math.round((double)Math.abs(deltaX) * xFactor); deltaX = (int) Math.round((double) Math.abs(deltaX) * xFactor);
deltaY = (int)Math.round((double)Math.abs(deltaY) * yFactor); deltaY = (int) Math.round((double) Math.abs(deltaY) * yFactor);
// Fix up the signs // Fix up the signs
if (eventX < lastTouchX) { if (eventX < lastTouchX) {
@ -211,6 +229,16 @@ public class RelativeTouchContext implements TouchContext {
deltaY = -deltaY; deltaY = -deltaY;
} }
if (pointerCount == 2) {
if (confirmedScroll) {
deltaY /= SCROLL_SPEED_DIVISOR;
conn.sendMouseHighResScroll((short) deltaY);
}
} else {
conn.sendMouseMove((short) deltaX, (short) deltaY);
}
// If the scaling factor ended up rounding deltas to zero, wait until they are // If the scaling factor ended up rounding deltas to zero, wait until they are
// non-zero to update lastTouch that way devices that report small touch events often // non-zero to update lastTouch that way devices that report small touch events often
// will work correctly // will work correctly
@ -220,8 +248,6 @@ public class RelativeTouchContext implements TouchContext {
if (deltaY != 0) { if (deltaY != 0) {
lastTouchY = eventY; lastTouchY = eventY;
} }
conn.sendMouseMove((short)deltaX, (short)deltaY);
} }
else { else {
lastTouchX = eventX; lastTouchX = eventX;
@ -251,5 +277,7 @@ public class RelativeTouchContext implements TouchContext {
} }
@Override @Override
public void setPointerCount(int pointerCount) {} public void setPointerCount(int pointerCount) {
this.pointerCount = pointerCount;
}
} }