Add test for column-row-span with spacing (#1609)

* Add test for column-row-span with spacing

* Fix test assertion value

* Add fix for the failing test

Author: Ibrahim2750mi

arcade/gui/widgets/layout.py

@@ -640,19 +640,20 @@ def do_layout(self):
         principal_height_ratio_list = []
         principal_width_ratio_list = []
 
-        # making max_height_per_row and max_width_per_column uniform
+        # Making cell height same for each row.
         for row in max_height_per_row:
-            principal_height_ratio = max(height / (span or 1) for height, span in row)
+            principal_height_ratio = max((height + self._vertical_spacing) / (span or 1) for height, span in row)
             principal_height_ratio_list.append(principal_height_ratio)
             for i, (height, span) in enumerate(row):
-                if height / (span or 1) < principal_height_ratio:
+                if (height + self._vertical_spacing) / (span or 1) < principal_height_ratio:
                     row[i] = (principal_height_ratio * span, span)
 
+        # Making cell width same for each column.
         for col in max_width_per_column:
-            principal_width_ratio = max(width / (span or 1) for width, span in col)
+            principal_width_ratio = max((width + self._horizontal_spacing) / (span or 1) for width, span in col)
             principal_width_ratio_list.append(principal_width_ratio)
             for i, (width, span) in enumerate(col):
-                if width / (span or 1) < principal_width_ratio:
+                if (width + self._horizontal_spacing) / (span or 1) < principal_width_ratio:
                     col[i] = (principal_width_ratio * span, span)
 
         content_height = sum(principal_height_ratio_list) + self.row_count * self._vertical_spacing

tests/test_gui/test_layouting_gridlayout.py

@@ -126,6 +126,35 @@ def test_place_widgets_with_col_row_span(window):
     assert dummy6.position == (200, 50)
 
 
+def test_place_widgets_with_col_row_span_and_spacing(window):
+    dummy1 = UIDummy(width=100, height=100)
+    dummy2 = UIDummy(width=100, height=100)
+    dummy3 = UIDummy(width=100, height=100)
+    dummy4 = UIDummy(width=100, height=100)
+    dummy5 = UIDummy(width=220, height=100)
+
+    subject = UIGridLayout(
+        column_count=2,
+        row_count=3,
+        horizontal_spacing=20,
+    )
+
+    subject.add(dummy1, 0, 0)
+    subject.add(dummy2, 0, 1)
+    subject.add(dummy3, 1, 0)
+    subject.add(dummy4, 1, 1)
+    subject.add(dummy5, 0, 2, col_span=2)
+
+    subject.rect = Rect(0, 0, *subject.size_hint_min)
+    subject.do_layout()
+
+    assert dummy1.position == (10, 200)
+    assert dummy2.position == (10, 100)
+    assert dummy3.position == (130, 200)
+    assert dummy4.position == (130, 100)
+    assert dummy5.position == (10, 0)
+
+
 def test_fit_content_by_default(window):
     subject = UIGridLayout(
         column_count=1,