Skip to content

Commit

Permalink
Fix getRawX and getRawY logic
Browse files Browse the repository at this point in the history
Previous logic was only correct for cases where `getRawX` is the same as `getX`
  • Loading branch information
matteblair committed Jul 4, 2020
1 parent 52c69de commit 20fc92e
Showing 1 changed file with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,10 @@ public float getPreviousSpan() {
* @return
*/
protected static float getRawX(MotionEvent event, int pointerIndex) {
float offset = event.getX() - event.getRawX();
if(pointerIndex < event.getPointerCount()){
return event.getX(pointerIndex) + offset;
}
float viewToRaw = event.getRawX() - event.getX();
if (pointerIndex < event.getPointerCount()) {
return event.getX(pointerIndex) + viewToRaw;
}
return 0f;
}

Expand All @@ -133,10 +133,10 @@ protected static float getRawX(MotionEvent event, int pointerIndex) {
* @return
*/
protected static float getRawY(MotionEvent event, int pointerIndex) {
float offset = event.getY() - event.getRawY();
if(pointerIndex < event.getPointerCount()){
return event.getY(pointerIndex) + offset;
}
float viewToRaw = event.getRawY() - event.getY();
if (pointerIndex < event.getPointerCount()) {
return event.getY(pointerIndex) + viewToRaw;
}
return 0f;
}

Expand Down

0 comments on commit 20fc92e

Please sign in to comment.