mirror of
https://github.com/SimpleMobileTools/Simple-Draw.git
synced 2025-06-05 21:59:17 +02:00
disable the eyedropper if a brush or bg color is picked
This commit is contained in:
@ -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)
|
||||||
|
Reference in New Issue
Block a user