fix margins

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 
 - Fixed `TextArea` to end mouse selection only if currently selecting https://github.com/Textualize/textual/pull/4436
+- Fixed issue with margins
 
 ### Changed
 

src/textual/_layout.py

@@ -161,7 +161,7 @@ def get_content_width(self, widget: Widget, container: Size, viewport: Size) ->
             width = 0
         else:
             arrangement = widget._arrange(Size(0, 0))
-            return arrangement.total_region.right
+            return arrangement.spatial_map.total_region.right
         return width
 
     def get_content_height(

src/textual/layouts/horizontal.py

@@ -38,7 +38,7 @@ def arrange(
                     ]
                 )
                 + (box_margins[0].left + box_margins[-1].right),
-                min(
+                max(
                     [
                         margin_top + margin_bottom
                         for margin_top, _, margin_bottom, _ in box_margins

src/textual/layouts/vertical.py

@@ -29,7 +29,7 @@ def arrange(
         ]
         if box_margins:
             resolve_margin = Size(
-                min(
+                max(
                     [
                         margin_right + margin_left
                         for _, margin_right, _, margin_left in box_margins

src/textual/widget.py

@@ -1233,9 +1233,11 @@ def get_content_width(self, container: Size, viewport: Size) -> int:
         Returns:
             The optimal width of the content.
         """
+
         if self.is_container:
             assert self._layout is not None
-            return self._layout.get_content_width(self, container, viewport)
+            width = self._layout.get_content_width(self, container, viewport)
+            return width
 
         cache_key = container.width
         if self._content_width_cache[0] == cache_key:

tests/snapshot_tests/snapshot_apps/margin_multiple.py

@@ -0,0 +1,43 @@
+from textual.app import App, ComposeResult
+from textual.containers import Container, ScrollableContainer, Horizontal
+from textual.widgets import Label
+
+
+class CompoundWidget(ScrollableContainer):
+    DEFAULT_CSS = """
+    #inner {
+        width: 1fr;
+        background: $panel;
+        align: center middle;
+        margin: 5;
+        border: green;
+ 
+    }
+    
+    Label {
+        border: double yellow;
+    }
+    """
+
+    def compose(self) -> ComposeResult:
+        yield Label("foo")
+        with Container(id="inner"):
+            yield Label("bar")
+
+
+class MyApp(App):
+    CSS = """
+    #widget2 > Label {
+        display: none;
+    }
+
+    """
+
+    def compose(self) -> ComposeResult:
+        with Horizontal():
+            yield CompoundWidget(id="widget1")
+            yield CompoundWidget(id="widget2")
+
+
+if __name__ == "__main__":
+    MyApp().run()

tests/snapshot_tests/test_snapshots.py

@@ -1236,7 +1236,7 @@ def test_example_pride(snap_compare):
     """Test the pride example."""
     assert snap_compare(EXAMPLES_DIR / "pride.py")
 
-    
+
 def test_button_with_console_markup(snap_compare):
     """Regression test for https://github.com/Textualize/textual/issues/4328"""
     assert snap_compare(SNAPSHOT_APPS_DIR / "button_markup.py")
@@ -1249,3 +1249,7 @@ def test_width_100(snap_compare):
 
 def test_button_with_multiline_label(snap_compare):
     assert snap_compare(SNAPSHOT_APPS_DIR / "button_multiline_label.py")
+
+
+def test_margin_multiple(snap_compare):
+    assert snap_compare(SNAPSHOT_APPS_DIR / "margin_multiple.py")