Make grids without proportional rows/cols respect min size properly

BadMagic100 · Jul 31, 2022 · 3a39c2b · 3a39c2b
1 parent 83d1a0d
commit 3a39c2b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/MagicUI/Core/Internal/SettingsBoundLogger.cs b/MagicUI/Core/Internal/SettingsBoundLogger.cs
@@ -4,7 +4,7 @@ namespace MagicUI.Core.Internal
 {
     internal class SettingsBoundLogger
     {
-        private SimpleLogger logger;
+        private readonly SimpleLogger logger;
 
         public SettingsBoundLogger(string name)
         {

diff --git a/MagicUI/Elements/GridLayout.cs b/MagicUI/Elements/GridLayout.cs
@@ -303,6 +303,16 @@ protected override Vector2 MeasureOverride()
                     colSizes[col] += remainingWidth * colProportions[col];
                 }
             }
+            remainingWidth = minWidth - colSizes.Sum();
+            // on the offchance there's no proportional cols, reallocate the remaining space equally among the absolute columns.
+            if (remainingWidth > 0)
+            {
+                float sizePerCol = remainingWidth / colDefs.Count;
+                for (int col = 0; col < colDefs.Count; col++)
+                {
+                    colSizes[col] += sizePerCol;
+                }
+            }
 
             float remainingHeight = minHeight - requiredHeight;
             if (remainingHeight > 0)
@@ -312,6 +322,15 @@ protected override Vector2 MeasureOverride()
                     rowSizes[row] += remainingHeight * rowProportions[row];
                 }
             }
+            remainingHeight = minHeight - rowSizes.Sum();
+            if (remainingHeight > 0)
+            {
+                float sizePerRow = remainingHeight / rowDefs.Count;
+                for (int row = 0; row < rowDefs.Count; row++)
+                {
+                    rowSizes[row] += sizePerRow;
+                }
+            }
 
             log.Log($"Grid property post fill space");
             log.Log($"Row sizes: {string.Join(", ", rowSizes)}");