Changed to updated Pack.layout() signature (without node)

changes/244.misc.rst

@@ -0,0 +1 @@
+Node.reresh() has been updated to use Toga 0.5.0's newer signature for style.layout, omitting the node parameter. It is still backwards-compatible with Toga 0.4.8.

src/travertino/node.py

@@ -1,3 +1,6 @@
+from inspect import signature
+
+
 class Node:
     def __init__(self, style, applicator=None, children=None):
         # Parent needs to be primed before style is (potentially) applied with
@@ -169,7 +172,17 @@ def refresh(self, viewport):
         if self._root:
             self._root.refresh(viewport)
         else:
-            self.style.layout(self, viewport)
+            ######################################################################
+            # 2024-12: Backwards compatibility for Toga <= 0.4.8
+            ######################################################################
+            params = signature(self.style.layout).parameters
+            if len(params) == 1 or "_deprecated_usage" in params:
+                self.style.layout(viewport)
+            else:
+                self.style.layout(self, viewport)
+            ######################################################################
+            # End backwards compatibility
+            ######################################################################
             if self.applicator:
                 self.applicator.set_bounds()
 

tests/test_node.py

@@ -21,10 +21,23 @@ class IntrinsicSize(BaseIntrinsicSize):
     class Box(BaseBox):
         pass
 
-    def layout(self, root, viewport):
+    def layout(self, viewport):
         # A simple layout scheme that allocates twice the viewport size.
-        root.layout.content_width = viewport.width * 2
-        root.layout.content_height = viewport.height * 2
+        self._applicator.node.layout.content_width = viewport.width * 2
+        self._applicator.node.layout.content_height = viewport.height * 2
+
+
+class OldStyle(Style):
+    # Uses two-argument layout(), as in Toga <= 0.4.8
+    def layout(self, node, viewport):
+        super().layout(viewport)
+
+
+class OldStyleDifferentName(Style):
+    # Just to be on the paranoid side, also test with a different parameter name, like
+    # this test used to have.
+    def layout(self, root, viewport):
+        super().layout(viewport)
 
 
 @prep_style_class
@@ -38,10 +51,10 @@ class IntrinsicSize(BaseIntrinsicSize):
     class Box(BaseBox):
         pass
 
-    def layout(self, root, viewport):
+    def layout(self, viewport):
         # A simple layout scheme that allocates twice the viewport size.
-        root.layout.content_width = viewport.width * 2
-        root.layout.content_height = viewport.height * 2
+        self._applicator.node.layout.content_width = viewport.width * 2
+        self._applicator.node.layout.content_height = viewport.height * 2
 
 
 class AttributeTestStyle(BaseStyle):
@@ -130,7 +143,8 @@ def test_create_node():
     assert child3.root == new_node
 
 
-def test_refresh():
+@pytest.mark.parametrize("StyleClass", [Style, OldStyle, OldStyleDifferentName])
+def test_refresh(StyleClass):
     """The layout can be refreshed, and the applicator invoked"""
 
     # Define an applicator that tracks the node being rendered and its size
@@ -155,7 +169,7 @@ def __init__(self, style, children=None):
             )
 
     # Define a simple 2 level tree of nodes.
-    style = Style()
+    style = StyleClass()
     child1 = TestNode(style=style)
     child2 = TestNode(style=style)
     child3 = TestNode(style=style)