Skip to content

Commit cc23991

Browse files
author
therealbluepandabear
committed
Fixed skewed rotation bug.
1 parent 0a4718e commit cc23991

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

app/src/main/java/com/therealbluepandabear/pixapencil/activities/canvas/CanvasActivity+getCoverImageBitmap.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ import com.therealbluepandabear.pixapencil.extensions.isRect
88
import com.therealbluepandabear.pixapencil.extensions.isWidthLarger
99
import com.therealbluepandabear.pixapencil.extensions.overlay
1010
import com.therealbluepandabear.pixapencil.extensions.rotate
11-
import kotlin.math.abs
12-
import kotlin.math.ceil
1311

1412
var gridWasEnabled = false
1513

@@ -57,7 +55,7 @@ fun CanvasActivity.getCoverImageBitmap(): Bitmap {
5755
}
5856

5957
val bmps: Bitmap?
60-
bmps = coverBitmap.rotate(ceil(abs(binding.activityCanvasCardView.rotation)).toInt(), viewModel.flipMatrix)
58+
bmps = coverBitmap.rotate(viewModel.trueRotation.toInt(), viewModel.flipMatrix)
6159

6260
enableGridIfNeeded()
6361

app/src/main/java/com/therealbluepandabear/pixapencil/activities/canvas/canvashelpers/CanvasActivity+rotate.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,7 @@ fun CanvasActivity.rotate(degrees: Float, clockwise: Boolean = true) {
1919

2020
binding.activityCanvasCardView.rotation = nR
2121
viewModel.currentRotation = nR
22+
23+
val tR = ceil(rotationAmount)
24+
viewModel.trueRotation = tR
2225
}

app/src/main/java/com/therealbluepandabear/pixapencil/activities/canvas/viewmodel/CanvasActivityViewModel.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ class CanvasActivityViewModel : ViewModel() {
2828
var currentSymmetryMode: SymmetryMode = SymmetryMode.None
2929
var currentTool: Tool = Tool.PencilTool
3030
var currentRotation: Float = 0f
31+
var trueRotation: Float = 0f
3132
var flipMatrix = mutableListOf<FlipValue>()
3233

3334
var saved = true

0 commit comments

Comments
 (0)