fenix/Simple-Draw
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Draw.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

do the drawing calculations only if moving and zooming is enabled

Browse Source
This commit is contained in:
tibbi
2021-02-18 12:24:24 +01:00
parent dafc49bc6a
commit 069abad7db
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,7 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
private var mActivePointerId = INVALID_POINTER_ID private var mActivePointerId = INVALID_POINTER_ID
private var mCurrBrushSize = 0f private var mCurrBrushSize = 0f
private var mAllowZooming = true private var mAllowMovingZooming = true
private var mIsEraserOn = false private var mIsEraserOn = false
private var mWasMultitouch = false private var mWasMultitouch = false
private var mBackgroundColor = 0 private var mBackgroundColor = 0
@@ -134,7 +134,7 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
} }
fun setAllowZooming(allowZooming: Boolean) { fun setAllowZooming(allowZooming: Boolean) {
mAllowZooming = allowZooming mAllowMovingZooming = allowZooming
} }
fun getBitmap(): Bitmap { fun getBitmap(): Bitmap {
@@ -260,7 +260,7 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
fun getDrawingHashCode() = mPaths.hashCode().toLong() + (mBackgroundBitmap?.hashCode()?.toLong() ?: 0L) fun getDrawingHashCode() = mPaths.hashCode().toLong() + (mBackgroundBitmap?.hashCode()?.toLong() ?: 0L)
override fun onTouchEvent(event: MotionEvent): Boolean { override fun onTouchEvent(event: MotionEvent): Boolean {
if (mAllowZooming) { if (mAllowMovingZooming) {
mScaleDetector!!.onTouchEvent(event) mScaleDetector!!.onTouchEvent(event)
} }
@@ -273,15 +273,20 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
val x = event.getX(pointerIndex) val x = event.getX(pointerIndex)
val y = event.getY(pointerIndex) val y = event.getY(pointerIndex)
val scaledWidth = width / mScaleFactor var newValueX = x
val touchPercentageX = x / width var newValueY = y
val compensationX = (scaledWidth / 2) * (1 - mScaleFactor)
val newValueX = scaledWidth * touchPercentageX - compensationX - (mPosX / mScaleFactor)
val scaledHeight = height / mScaleFactor if (mAllowMovingZooming) {
val touchPercentageY = y / height val scaledWidth = width / mScaleFactor
val compensationY = (scaledHeight / 2) * (1 - mScaleFactor) val touchPercentageX = x / width
val newValueY = scaledHeight * touchPercentageY - compensationY - (mPosY / mScaleFactor) val compensationX = (scaledWidth / 2) * (1 - mScaleFactor)
newValueX = scaledWidth * touchPercentageX - compensationX - (mPosX / mScaleFactor)
val scaledHeight = height / mScaleFactor
val touchPercentageY = y / height
val compensationY = (scaledHeight / 2) * (1 - mScaleFactor)
newValueY = scaledHeight * touchPercentageY - compensationY - (mPosY / mScaleFactor)
}
when (event.action and MotionEvent.ACTION_MASK) { when (event.action and MotionEvent.ACTION_MASK) {
MotionEvent.ACTION_DOWN -> { MotionEvent.ACTION_DOWN -> {
@@ -295,11 +300,11 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
mListener?.toggleRedoVisibility(false) mListener?.toggleRedoVisibility(false)
} }
MotionEvent.ACTION_MOVE -> { MotionEvent.ACTION_MOVE -> {
if (!mAllowZooming || (!mScaleDetector!!.isInProgress && event.pointerCount == 1 && !mWasMultitouch)) { if (!mAllowMovingZooming || (!mScaleDetector!!.isInProgress && event.pointerCount == 1 && !mWasMultitouch)) {
actionMove(newValueX, newValueY) actionMove(newValueX, newValueY)
} }
if (mWasMultitouch) { if (mAllowMovingZooming && mWasMultitouch) {
mPosX += x - mLastTouchX mPosX += x - mLastTouchX
mPosY += y - mLastTouchY mPosY += y - mLastTouchY
invalidate() invalidate()