Merge pull request #54 from darktiny/fix_alpha

Fix selectByColor not updating alpha
skydoves · May 8, 2024 · e33f505 · e33f505
2 parents 7112a71 + 31a0220
commit e33f505
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/colorpicker-compose/api/colorpicker-compose.api b/colorpicker-compose/api/colorpicker-compose.api
@@ -43,6 +43,7 @@ public final class com/github/skydoves/colorpicker/compose/ColorPickerController
 	public final fun selectByColor-DxMtmZc (JZ)V
 	public final fun selectByCoordinate (FFZ)V
 	public final fun selectCenter (Z)V
+	public final fun setAlpha (FZ)V
 	public final fun setBrightness (FZ)V
 	public final fun setDebounceDuration (J)V
 	public final fun setEnabled (Z)V

diff --git a/...-compose/src/main/kotlin/com/github/skydoves/colorpicker/compose/ColorPickerController.kt b/...-compose/src/main/kotlin/com/github/skydoves/colorpicker/compose/ColorPickerController.kt
@@ -240,6 +240,8 @@ public class ColorPickerController {
         val y = saturationVector * sin(angle) + (palette.height / 2)
         selectByCoordinate(x.toFloat(), y.toFloat(), fromUser)
 
+        setAlpha(color.alpha, fromUser = false)
+
         val brightness = max(max(color.red, color.green), color.blue)
         setBrightness(brightness, fromUser = false)
       }
@@ -270,7 +272,7 @@ public class ColorPickerController {
   }
 
   /** Combine the alpha value to the selected pure color. */
-  internal fun setAlpha(alpha: Float, fromUser: Boolean) {
+  public fun setAlpha(alpha: Float, fromUser: Boolean) {
     this.alpha.value = alpha
     _selectedColor.value = selectedColor.value.copy(alpha = alpha)
     notifyColorChanged(fromUser)