Merge pull request #7 from godaddy/bugfix/checkerboard

Fix #5 - incorrect size of checkerboard.
godaddy · Nov 7, 2021 · 756cf7b · 756cf7b
2 parents 49a0df7 + d8c464f
commit 756cf7b
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/color-picker/src/main/java/com/godaddy/android/colorpicker/AlphaBar.kt b/color-picker/src/main/java/com/godaddy/android/colorpicker/AlphaBar.kt
@@ -8,16 +8,19 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ExperimentalGraphicsApi
 import androidx.compose.ui.graphics.drawscope.DrawScope
 import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.graphics.drawscope.clipRect
 import androidx.compose.ui.input.pointer.consumePositionChange
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.unit.dp
+import kotlin.math.ceil
 import kotlin.math.floor
 
 /**
@@ -67,7 +70,10 @@ internal fun AlphaBar(
             }
         }) {
 
-        drawCheckeredBackground()
+        clipRect {
+            drawCheckeredBackground()
+        }
+
         drawAlphaBar(currentColorToAlphaBrush)
 
         val position = getPositionFromAlpha(
@@ -88,8 +94,8 @@ private fun DrawScope.drawCheckeredBackground() {
     val lightColor = Color.White
 
     val gridSizePx = 8.dp.toPx()
-    val cellCountX = floor(this.size.width / gridSizePx).toInt()
-    val cellCountY = floor(this.size.height / gridSizePx).toInt()
+    val cellCountX = ceil(this.size.width / gridSizePx).toInt()
+    val cellCountY = ceil(this.size.height / gridSizePx).toInt()
     for (i in 0 until cellCountX) {
         for (j in 0 until cellCountY) {
             val color = if ((i + j) % 2 == 0) darkColor else lightColor