width dimensions

Author: willmcgugan

src/textual/_arrange.py

@@ -99,23 +99,13 @@ def arrange(
             # Perform any alignment of the widgets.
             if styles.align_horizontal != "left" or styles.align_vertical != "top":
                 bounding_region = WidgetPlacement.get_bounds(layout_placements)
-
                 container_width, container_height = dock_region.size
-                widget.log(
-                    widget, bounding_region=bounding_region, container=dock_region
-                )
-
-                min_height = 0
-                if styles.min_height is not None:
-                    min_height = int(
-                        styles.min_height.resolve(size, viewport, Fraction(size.height))
-                    )
-
+                extrema = widget._extrema
                 placement_offset += styles._align_size(
                     bounding_region.size,
-                    Size(
+                    extrema.apply_dimensions(
                         0 if styles.is_auto_width else container_width,
-                        min_height if styles.is_auto_height else container_height,
+                        0 if styles.is_auto_height else container_height,
                     ),
                 ).clamped
 

src/textual/_extrema.py

@@ -3,6 +3,8 @@
 from fractions import Fraction
 from typing import NamedTuple
 
+from textual.geometry import Size
+
 
 class Extrema(NamedTuple):
     """Specifies minimum and maximum dimensions."""
@@ -45,3 +47,18 @@ def apply_height(self, height: Fraction) -> Fraction:
         if max_height is not None:
             height = min(height, max_height)
         return height
+
+    def apply_dimensions(self, width: int, height: int) -> Size:
+        """Apply extrema to integer dimensions.
+
+        Args:
+            width: Integer width.
+            height: Integer height.
+
+        Returns:
+            Size with extrema applied.
+        """
+        return Size(
+            int(self.apply_width(Fraction(width))),
+            int(self.apply_height(Fraction(height))),
+        )

src/textual/layout.py

@@ -2,6 +2,7 @@
 
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
+from fractions import Fraction
 from typing import TYPE_CHECKING, ClassVar, Iterable, NamedTuple
 
 from textual._spatial_map import SpatialMap
@@ -237,9 +238,16 @@ def get_content_width(self, widget: Widget, container: Size, viewport: Size) ->
             width = 0
         else:
             arrangement = widget._arrange(
-                Size(0 if widget.shrink else container.width, 0)
+                Size(
+                    (
+                        int(widget._extrema.min_width or 0)
+                        if widget.shrink
+                        else int(widget._extrema.apply_width(Fraction(container.width)))
+                    ),
+                    0,
+                )
             )
-            width = arrangement.total_region.right
+            width = arrangement.total_region.width
         return width
 
     def get_content_height(
@@ -264,11 +272,14 @@ def get_content_height(
             ):
                 # An exception for containers with all dynamic height widgets
                 arrangement = widget._arrange(
-                    Size(width, widget._extrema.apply_height(container.height))
+                    Size(
+                        width,
+                        int(widget._extrema.apply_height(Fraction(container.height))),
+                    )
                 )
             else:
                 arrangement = widget._arrange(
-                    Size(width, widget._extrema.min_height or 0)
+                    Size(width, int(widget._extrema.min_height or 0))
                 )
             height = arrangement.total_region.height
         else: