Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix child constraints in (Horizontal|Vertical)Grid

Browse Source 
Bug: 290184746
Test: Manual. Wrote a demo with multiple grids in http://aosp/2635217
Change-Id: I2d67f43a53e76a7053473fce327c5f82a14f2c75
This commit is contained in:
Jordan Demeulenaere
2023-07-10 15:41:25 +02:00
parent fc8905a72b
commit 3d5bf056c3
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/SystemUI/compose/core/src/com/android/compose/grid/Grids.kt
View File

@@ -22,7 +22,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.Layout import androidx.compose.ui.layout.Layout
import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.Constraints
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.constrainWidth
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import kotlin.math.ceil import kotlin.math.ceil
import kotlin.math.max import kotlin.math.max
@@ -126,18 +125,20 @@ private fun Grid(
((columns - 1) * horizontalSpacing.toPx()).roundToInt() ((columns - 1) * horizontalSpacing.toPx()).roundToInt()
val totalVerticalSpacingBetweenChildren = ((rows - 1) * verticalSpacing.toPx()).roundToInt() val totalVerticalSpacingBetweenChildren = ((rows - 1) * verticalSpacing.toPx()).roundToInt()
val childConstraints = val childConstraints =
Constraints().apply { Constraints(
if (constraints.maxWidth != Constraints.Infinity) { maxWidth =
constrainWidth( if (constraints.maxWidth != Constraints.Infinity) {
(constraints.maxWidth - totalHorizontalSpacingBetweenChildren) / columns (constraints.maxWidth - totalHorizontalSpacingBetweenChildren) / columns
) } else {
} Constraints.Infinity
if (constraints.maxHeight != Constraints.Infinity) { },
constrainWidth( maxHeight =
if (constraints.maxHeight != Constraints.Infinity) {
(constraints.maxHeight - totalVerticalSpacingBetweenChildren) / rows (constraints.maxHeight - totalVerticalSpacingBetweenChildren) / rows
) } else {
} Constraints.Infinity
} }
)
val placeables = buildList { val placeables = buildList {
for (cellIndex in measurables.indices) { for (cellIndex in measurables.indices) {