@@ -7,35 +7,22 @@ import com.therealbluepandabear.pixapencil.activities.canvas.CanvasActivity
77import com.therealbluepandabear.pixapencil.activities.canvas.canvashelpers.drawPixelGridViewBitmap
88import com.therealbluepandabear.pixapencil.activities.canvas.canvashelpers.drawTransparentBackgroundViewBitmap
99import com.therealbluepandabear.pixapencil.activities.canvas.selectedColorPaletteIndex
10- import com.therealbluepandabear.pixapencil.enums.SnackbarDuration
1110import com.therealbluepandabear.pixapencil.extensions.getColors
12- import com.therealbluepandabear.pixapencil.extensions.showSnackbar
11+ import com.therealbluepandabear.pixapencil.extensions.rotate
1312import com.therealbluepandabear.pixapencil.fragments.replacecolor.ReplaceColorFragment
13+ import kotlin.math.abs
14+ import kotlin.math.ceil
1415
1516fun CanvasActivity.onFindAndReplaceOptionsItemSelected () {
16- val paramScaledWidth =
17- if (binding.activityCanvasPixelGridView.drawToBitmap().width <= drawPixelGridViewBitmap().width) {
18- drawPixelGridViewBitmap().width * (drawPixelGridViewBitmap().width / binding.activityCanvasPixelGridView.drawToBitmap().width)
19- } else {
20- drawPixelGridViewBitmap().width * (binding.activityCanvasPixelGridView.drawToBitmap().width / drawPixelGridViewBitmap().width)
21- }
22-
23- val paramScaledHeight =
24- if (binding.activityCanvasPixelGridView.drawToBitmap().height <= drawPixelGridViewBitmap().height) {
25- drawPixelGridViewBitmap().height * (drawPixelGridViewBitmap().height / binding.activityCanvasPixelGridView.drawToBitmap().height)
26- } else {
27- drawPixelGridViewBitmap().height * (binding.activityCanvasPixelGridView.drawToBitmap().height / drawPixelGridViewBitmap().height)
28- }
29-
3017 supportFragmentManager.commit {
3118 replace(
3219 R .id.activityCanvas_primaryFragmentHost, ReplaceColorFragment .newInstance(
3320 paramCanvasColors = binding.activityCanvasPixelGridView.pixelGridViewBitmap.getColors(),
3421 paramPixelGridViewBitmapSource = drawPixelGridViewBitmap(),
3522 paramTransparentBitmapSource = drawTransparentBackgroundViewBitmap(),
3623 paramSelectedColorPaletteIndex = selectedColorPaletteIndex,
37- paramScaledWidth = paramScaledWidth ,
38- paramScaledHeight = paramScaledHeight
24+ paramScaledWidth = binding.activityCanvasPixelGridView.drawToBitmap().rotate(ceil(abs(binding.activityCanvasCardView.rotation)).toInt(), viewModel.flipMatrix).width ,
25+ paramScaledHeight = binding.activityCanvasPixelGridView.drawToBitmap().rotate(ceil(abs(binding.activityCanvasCardView.rotation)).toInt(), viewModel.flipMatrix).height
3926 )
4027 )
4128 addToBackStack(null )
0 commit comments