disable the eyedropper if a brush or bg color is picked

This commit is contained in:
tibbi 2021-12-29 10:41:38 +01:00
parent 4dec99bc9d
commit 9ff0c7e5c7

View File

@ -519,12 +519,20 @@ class MainActivity : SimpleActivity(), CanvasListener {
private fun pickColor() { private fun pickColor() {
ColorPickerDialog(this, color) { wasPositivePressed, color -> ColorPickerDialog(this, color) { wasPositivePressed, color ->
if (wasPositivePressed) { if (wasPositivePressed) {
if (isEyeDropperOn) {
eyeDropperClicked()
}
setColor(color) setColor(color)
} }
} }
} }
fun setBackgroundColor(pickedColor: Int) { fun setBackgroundColor(pickedColor: Int) {
if (isEyeDropperOn) {
eyeDropperClicked()
}
val contrastColor = pickedColor.getContrastColor() val contrastColor = pickedColor.getContrastColor()
undo.applyColorFilter(contrastColor) undo.applyColorFilter(contrastColor)
eraser.applyColorFilter(contrastColor) eraser.applyColorFilter(contrastColor)