Skip to content

Commit 16aeef4

Browse files
author
therealbluepandabear
committed
Fix minor code issue to do with scaling.
1 parent 06838d6 commit 16aeef4

1 file changed

Lines changed: 24 additions & 17 deletions

File tree

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

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,31 @@ import com.therealbluepandabear.pixapencil.extensions.showSnackbar
1313
import com.therealbluepandabear.pixapencil.fragments.replacecolor.ReplaceColorFragment
1414

1515
fun CanvasActivity.onFindAndReplaceOptionsItemSelected() {
16-
val uniqueColors = binding.activityCanvasPixelGridView.pixelGridViewBitmap.getColors()
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+
}
1722

18-
if (uniqueColors.isNotEmpty()) {
19-
supportFragmentManager.commit {
20-
replace(
21-
R.id.activityCanvas_primaryFragmentHost, ReplaceColorFragment.newInstance(
22-
paramCanvasColors = uniqueColors,
23-
paramPixelGridViewBitmapSource = drawPixelGridViewBitmap(),
24-
paramTransparentBitmapSource = drawTransparentBackgroundViewBitmap(),
25-
paramSelectedColorPaletteIndex = selectedColorPaletteIndex,
26-
paramScaledWidth = drawPixelGridViewBitmap().width * (binding.activityCanvasPixelGridView.drawToBitmap().width / drawPixelGridViewBitmap().width),
27-
paramScaledHeight = drawPixelGridViewBitmap().height * (binding.activityCanvasPixelGridView.drawToBitmap().height / drawPixelGridViewBitmap().height)
28-
))
29-
addToBackStack(null)
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)
3028
}
31-
} else {
32-
binding.activityCanvasCoordinatorLayout.showSnackbar(
33-
getString(R.string.snackbar_find_and_replace_warning),
34-
SnackbarDuration.Default)
29+
30+
supportFragmentManager.commit {
31+
replace(
32+
R.id.activityCanvas_primaryFragmentHost, ReplaceColorFragment.newInstance(
33+
paramCanvasColors = binding.activityCanvasPixelGridView.pixelGridViewBitmap.getColors(),
34+
paramPixelGridViewBitmapSource = drawPixelGridViewBitmap(),
35+
paramTransparentBitmapSource = drawTransparentBackgroundViewBitmap(),
36+
paramSelectedColorPaletteIndex = selectedColorPaletteIndex,
37+
paramScaledWidth = paramScaledWidth,
38+
paramScaledHeight = paramScaledHeight
39+
)
40+
)
41+
addToBackStack(null)
3542
}
3643
}

0 commit comments

Comments
 (0)