[widget Audit] toga.SplitContainer

cocoa/src/toga_cocoa/widgets/splitcontainer.py

@@ -56,7 +56,8 @@ def create(self):
     def set_bounds(self, x, y, width, height):
         super().set_bounds(x, y, width, height)
         for container in self.sub_containers:
-            container.content.interface.refresh()
+            if container.content:
+                container.content.interface.refresh()
 
         # Apply any pending split
         self.native.performSelector(
@@ -72,15 +73,19 @@ def set_content(self, content, flex):
 
         for index, widget in enumerate(content):
             # Compute the minimum layout for the content
-            widget.interface.style.layout(widget.interface, MinimumContainer())
-            min_width = widget.interface.layout.width
-            min_height = widget.interface.layout.height
+            if widget:
+                widget.interface.style.layout(widget.interface, MinimumContainer())
+                min_width = widget.interface.layout.width
+                min_height = widget.interface.layout.height
 
-            # Create a container with that minimum size, and assign the widget as content
-            self.sub_containers[index].min_width = min_width
-            self.sub_containers[index].min_height = min_height
+                # Create a container with that minimum size, and assign the widget as content
+                self.sub_containers[index].min_width = min_width
+                self.sub_containers[index].min_height = min_height
 
-            self.sub_containers[index].content = widget
+                self.sub_containers[index].content = widget
+            else:
+                self.sub_containers[index].min_width = 0
+                self.sub_containers[index].min_height = 0
 
         # We now know the initial positions of the split. However, we can't *set* the
         # because Cocoa requires a pixel position, and the widget isn't visible yet.

core/src/toga/constants/__init__.py

@@ -4,5 +4,6 @@
 
 
 class Direction(Enum):
+    "The direction a given property should act"
     HORIZONTAL = 0
     VERTICAL = 1

core/src/toga/widgets/divider.py

@@ -23,9 +23,9 @@ def __init__(
         :param style: A style object. If no style is provided, a default style will be
             applied to the widget.
         :param direction: The direction in which the divider will be drawn. Either
-            :attr:`~toga.widgets.SplitContainer.HORIZONTAL` or
-            :attr:`~toga.widgets.SplitContainer.VERTICAL`; defaults to
-            :attr:`~toga.widgets.SplitContainer.HORIZONTAL`
+            :attr:`~toga.constants.Direction.HORIZONTAL` or
+            :attr:`~toga.constants.Direction.VERTICAL`; defaults to
+            :attr:`~toga.constants.Direction.HORIZONTAL`
         """
         super().__init__(id=id, style=style)
 

core/src/toga/widgets/splitcontainer.py

@@ -14,7 +14,10 @@ def __init__(
         id=None,
         style=None,
         direction: Direction = Direction.VERTICAL,
-        content: list[Widget | tuple[Widget, int]] | None = None,
+        content: tuple[Widget | tuple[Widget, int], Widget | tuple[Widget, int]] = (
+            None,
+            None,
+        ),
     ):
         """Create a new SplitContainer.
 
@@ -24,26 +27,23 @@ def __init__(
         :param style: A style object. If no style is provided, a default style will be
             applied to the widget.
         :param direction: The direction in which the divider will be drawn. Either
-            :attr:`~toga.widgets.SplitContainer.HORIZONTAL` or
-            :attr:`~toga.widgets.SplitContainer.VERTICAL`; defaults to
-            :attr:`~toga.widgets.SplitContainer.VERTICAL`
+            :attr:`~toga.constants.Direction.HORIZONTAL` or
+            :attr:`~toga.constants.Direction.VERTICAL`; defaults to
+            :attr:`~toga.constants.Direction.VERTICAL`
         :param content: The content that will fill the panels of the SplitContainer. A
-            list with 2 elements; each item in the list is either:
+            tuple with 2 elements; each item in the tuple is either:
 
-            * A tuple containing of a widget and the initial flex value to apply to
+            * A tuple consisting of a widget and the initial flex value to apply to
               that widget in the split.
             * A widget. The widget will be given a flex value of 1.
 
         """
         super().__init__(id=id, style=style)
 
-        self._content = []
-
         # Create a platform specific implementation of a SplitContainer
         self._impl = self.factory.SplitContainer(interface=self)
 
-        if content:
-            self.content = content
+        self.content = content
         self.direction = direction
 
     @property
@@ -64,26 +64,31 @@ def focus(self):
         pass
 
     @property
-    def content(self) -> list[Widget]:
+    def content(self) -> tuple[Widget, Widget]:
         """The widgets displayed in the SplitContainer.
 
         When retrieved, only the list of widgets is returned.
 
-        When setting the value, the list must have at least 2 elements; each item in the
+        When setting the value, the list must have exactly 2 elements; each item in the
         list can be either:
 
-        * A tuple containing of a widget and the initial flex value to apply to that
+        * A tuple consisting of a widget and the initial flex value to apply to that
           widget in the split.
         * A widget. The widget will be given a flex value of 1.
 
         """
         return self._content
 
     @content.setter
-    def content(self, content):
-        if content is None or len(content) != 2:
+    def content(
+        self, content: tuple[Widget | tuple[Widget, int], Widget | tuple[Widget, int]]
+    ):
+        try:
+            if len(content) != 2:
+                raise TypeError()
+        except TypeError:
             raise ValueError(
-                "SplitContainer content must be a list with exactly 2 elements"
+                "SplitContainer content must be a sequence with exactly 2 elements"
             )
 
         _content = []
@@ -92,8 +97,10 @@ def content(self, content):
             if isinstance(item, tuple):
                 if len(item) == 2:
                     widget, flex_value = item
-                    if flex_value < 1:
-                        flex_value = 1
+                    if flex_value <= 0:
+                        raise ValueError(
+                            "The flex value for an item in a SplitContainer must be >0"
+                        )
                 else:
                     raise ValueError(
                         "An item in SplitContainer content must be a 2-tuple "
@@ -107,11 +114,15 @@ def content(self, content):
             _content.append(widget)
             flex.append(flex_value)
 
-            widget.app = self.app
-            widget.window = self.window
+            if widget:
+                widget.app = self.app
+                widget.window = self.window
 
-        self._impl.set_content([w._impl for w in _content], flex)
-        self._content = _content
+        self._impl.set_content(
+            tuple(w._impl if w is not None else None for w in _content),
+            flex,
+        )
+        self._content = tuple(_content)
         self.refresh()
 
     @Widget.app.setter
@@ -120,8 +131,8 @@ def app(self, app):
         Widget.app.fset(self, app)
 
         # Also assign the app to the content in the container
-        if self.content:
-            for content in self.content:
+        for content in self.content:
+            if content:
                 content.app = app
 
     @Widget.window.setter
@@ -130,8 +141,8 @@ def window(self, window):
         Widget.window.fset(self, window)
 
         # Also assign the window to the content in the container
-        if self._content:
-            for content in self._content:
+        for content in self._content:
+            if content:
                 content.window = window
 
     @property