Merge "Correct inline qsb for foldables" into tm-dev

2022-03-21 14:30:19 +00:00
parent af6641414c 2903a624ce
commit 2017ee0208
1 changed files with 4 additions and 2 deletions
@@ -490,8 +490,10 @@ public class DeviceProfile {
    }

    private int calculateQsbWidth() {
-        return cellWidthPx * inv.numColumns
-                + cellLayoutBorderSpacePx.x * (inv.numColumns - 1)
+        int columns = isTwoPanels ? inv.numColumns * 2 : inv.numColumns;
+
+        return cellWidthPx * columns
+                + cellLayoutBorderSpacePx.x * (columns - 1)
                - (cellWidthPx - iconSizePx) // left and right cell space
                - iconSizePx * numShownHotseatIcons
                - hotseatBorderSpace * numShownHotseatIcons;