review

JetBrains · Nov 25, 2023 · 535e6da · 535e6da
1 parent 426706b
commit 535e6da
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/BasicLazyTree.kt b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/BasicLazyTree.kt
@@ -151,17 +151,19 @@ public fun <T> BasicLazyTree(
                 )
 
             val backgroundShape by derivedStateOf {
-                val upperCorners = flattenedTree.getOrNull(index - 1)?.id?.let {
+                val hasRoundedTopCorners = flattenedTree.getOrNull(index - 1)?.id?.let {
                     it !in treeState.delegate.selectedKeys
                 } ?: false
-                val bottomCorners = flattenedTree.getOrNull(index + 1)?.id?.let {
+                val hasRoundedBottomCorners = flattenedTree.getOrNull(index + 1)?.id?.let {
                     it !in treeState.delegate.selectedKeys
                 } ?: false
+                val topCornerSize = computerCornerSize(hasRoundedTopCorners, elementBackgroundCornerSize)
+                val bottomCornerSize = computerCornerSize(hasRoundedBottomCorners, elementBackgroundCornerSize)
                 RoundedCornerShape(
-                    topStart = if (upperCorners) elementBackgroundCornerSize else CornerSize(0.dp),
-                    topEnd = if (upperCorners) elementBackgroundCornerSize else CornerSize(0.dp),
-                    bottomEnd = if (bottomCorners) elementBackgroundCornerSize else CornerSize(0.dp),
-                    bottomStart = if (bottomCorners) elementBackgroundCornerSize else CornerSize(0.dp),
+                    topStart = topCornerSize,
+                    topEnd = topCornerSize,
+                    bottomEnd = bottomCornerSize,
+                    bottomStart = bottomCornerSize,
                 )
             }
             Row(
@@ -213,6 +215,11 @@ public fun <T> BasicLazyTree(
     }
 }
 
+private fun computerCornerSize(
+    isRounded: Boolean,
+    cornerSize: CornerSize,
+) = if (isRounded) cornerSize else CornerSize(0.dp)
+
 private fun Modifier.elementBackground(
     state: TreeElementState,
     selectedFocused: Color,