Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bc6d805 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Fix size caching bug in (Horizontal|Vertical)Grid 

This CL fixes a caching bug in (Horizontal|Vertical)Grid that would
occur when the size of an element in the grid changed size. We would
keep only the maximum size the element ever had into accout because we
never reset the values in the size cache.

See b/291053742#comment12 for before/after videos.

Bug: 291053742
Test: Manual, see b/291053742#comment12
Change-Id: I6db5bea7cf8012e39745f94ecbce5411275f37c2
parent a5370f97

packages/SystemUI/compose/scene/src/com/android/compose/grid/Grids.kt

+5 −0
Original line number Diff line number Diff line
@@ -116,9 +116,14 @@ private fun Grid( 


        if (sizeCache.rowHeights.size != rows) {

            sizeCache.rowHeights = IntArray(rows) { 0 }

        } else {

            repeat(rows) { i -> sizeCache.rowHeights[i] = 0 }

        }



        if (sizeCache.columnWidths.size != columns) {

            sizeCache.columnWidths = IntArray(columns) { 0 }

        } else {

            repeat(columns) { i -> sizeCache.columnWidths[i] = 0 }

        }



        val totalHorizontalSpacingBetweenChildren =