fenix
/
Simple-Draw
mirror of https://github.com/SimpleMobileTools/Simple-Draw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixing some multitouch glitches

This commit is contained in:
tibbi 2018-08-26 16:43:51 +02:00
parent 6554d0439c
commit ccc923251f
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/kotlin/com/simplemobiletools/draw/views/MyCanvas.kt
View File

@ -44,6 +44,7 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
private var mIsStrokeWidthBarEnabled = false private var mIsStrokeWidthBarEnabled = false
private var mAllowZooming = true private var mAllowZooming = true
private var mIsEraserOn = false private var mIsEraserOn = false
private var mWasMultitouch = false
private var mBackgroundColor = 0 private var mBackgroundColor = 0
private var mCenter: PointF? = null private var mCenter: PointF? = null
@ -261,13 +262,15 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
} }
private fun actionUp() { private fun actionUp() {
mPath.lineTo(mCurX, mCurY) if (!mWasMultitouch) {
mPath.lineTo(mCurX, mCurY)
// draw a dot on click // draw a dot on click
if (mStartX == mCurX && mStartY == mCurY) { if (mStartX == mCurX && mStartY == mCurY) {
mPath.lineTo(mCurX, mCurY + 2) mPath.lineTo(mCurX, mCurY + 2)
mPath.lineTo(mCurX + 1, mCurY + 2) mPath.lineTo(mCurX + 1, mCurY + 2)
mPath.lineTo(mCurX + 1, mCurY) mPath.lineTo(mCurX + 1, mCurY)
}
} }
mPaths[mPath] = mPaintOptions mPaths[mPath] = mPaintOptions
@ -288,21 +291,24 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
val x = event.x val x = event.x
val y = event.y val y = event.y
when (event.action) { when (event.action and MotionEvent.ACTION_MASK) {
MotionEvent.ACTION_DOWN -> { MotionEvent.ACTION_DOWN -> {
mWasMultitouch = false
mStartX = x mStartX = x
mStartY = y mStartY = y
actionDown(x, y) actionDown(x, y)
mUndonePaths.clear() mUndonePaths.clear()
mListener?.toggleRedoVisibility(false) mListener?.toggleRedoVisibility(false)
} }
MotionEvent.ACTION_MOVE -> { MotionEvent.ACTION_MOVE -> {
if (!mAllowZooming || (!mScaleDetector!!.isInProgress && event.pointerCount == 1)) { if (!mAllowZooming || (!mScaleDetector!!.isInProgress && event.pointerCount == 1 && !mWasMultitouch)) {
actionMove(x, y) actionMove(x, y)
} }
} }
MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> actionUp() MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> actionUp()
MotionEvent.ACTION_POINTER_DOWN -> mWasMultitouch = true
} }
invalidate() invalidate()