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

Merge pull request #267 from CactiChameleon9/patch-1

Browse Source 
Zoom towards the center of the screen
This commit is contained in:
Tibor Kaputa
2023-03-13 11:50:11 +01:00
committed by GitHub
parent ed1e6c9a9b da497e2359
commit 92a74c3b09
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,8 +22,6 @@ import com.simplemobiletools.draw.pro.models.MyPath
import com.simplemobiletools.draw.pro.models.PaintOptions import com.simplemobiletools.draw.pro.models.PaintOptions
import java.util.concurrent.ExecutionException import java.util.concurrent.ExecutionException
import kotlin.math.abs import kotlin.math.abs
import kotlin.math.max
import kotlin.math.min
class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) { class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
private val MIN_ERASER_WIDTH = 20f private val MIN_ERASER_WIDTH = 20f
@ -439,10 +437,17 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
mPath.reset() mPath.reset()
} }
if (mScaleFactor * detector.scaleFactor !in 0.1f..10.0f) {
return true
}
mIgnoreTouches = true mIgnoreTouches = true
mWasScalingInGesture = true mWasScalingInGesture = true
mScaleFactor *= detector.scaleFactor mScaleFactor *= detector.scaleFactor
mScaleFactor = max(0.1f, min(mScaleFactor, 10.0f))
mPosX *= detector.scaleFactor
mPosY *= detector.scaleFactor
setBrushSize(mCurrBrushSize) setBrushSize(mCurrBrushSize)
invalidate() invalidate()
return true return true