wbrawner/Simple-Draw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing a glitch with some lines being drawn at move gestures

Browse source
This commit is contained in:
tibbi 2022-03-09 15:30:49 +01:00
parent 24328a3812
commit cf05bbad91
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/kotlin/com/simplemobiletools/draw/pro/views/MyCanvas.kt
View file

@ -58,6 +58,7 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
private var mWasMultitouch = false
private var mIgnoreTouches = false
private var mWasScalingInGesture = false
private var mWasMovingCanvasInGesture = false
private var mBackgroundColor = 0
private var mCenter: PointF? = null
@ -108,6 +109,7 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
if (mIgnoreTouches && action == MotionEvent.ACTION_UP) {
mIgnoreTouches = false
mWasScalingInGesture = false
mWasMovingCanvasInGesture = false
return true
}
@ -143,6 +145,7 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
when (action) {
MotionEvent.ACTION_DOWN -> {
mWasScalingInGesture = false
mWasMovingCanvasInGesture = false
mWasMultitouch = false
mStartX = x
mStartY = y
@ -165,6 +168,7 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
if (mAllowMovingZooming && mWasMultitouch) {
mPosX += x - mLastTouchX
mPosY += y - mLastTouchY
mWasMovingCanvasInGesture = true
invalidate()
}
@ -175,6 +179,7 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
mActivePointerId = INVALID_POINTER_ID
actionUp(false)
mWasScalingInGesture = false
mWasMovingCanvasInGesture = false
}
MotionEvent.ACTION_POINTER_DOWN -> {
mWasMultitouch = true
@ -182,12 +187,11 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
}
MotionEvent.ACTION_POINTER_UP -> {
mIgnoreTouches = true
actionUp(!mWasScalingInGesture)
actionUp(!mWasScalingInGesture && !mWasMovingCanvasInGesture)
}
}
mLastMotionEvent = MotionEvent.obtain(event)
invalidate()
return true
}