Added API to insert and remove children

examples/layout_test/README.rst

@@ -0,0 +1,12 @@
+Layout Test
+===========
+
+Test app that demonstrates adding and removing widgets from box.
+
+Quickstart
+~~~~~~~~~~
+
+To run this example:
+
+    $ pip install toga
+    $ python -m tayout_test

examples/layout_test/layout_test/__init__.py

@@ -0,0 +1,9 @@
+# Examples of valid version strings
+# __version__ = '1.2.3.dev1'  # Development release 1
+# __version__ = '1.2.3a1'     # Alpha Release 1
+# __version__ = '1.2.3b1'     # Beta Release 1
+# __version__ = '1.2.3rc1'    # RC Release 1
+# __version__ = '1.2.3'       # Final Release
+# __version__ = '1.2.3.post1' # Post Release 1
+
+__version__ = '0.0.1'

examples/layout_test/layout_test/__main__.py

@@ -0,0 +1,4 @@
+from layout_test.app import main
+
+if __name__ == '__main__':
+    main().main_loop()

examples/layout_test/layout_test/app.py

@@ -0,0 +1,82 @@
+import toga
+from toga.style import Pack
+from toga.constants import ROW, COLUMN, CENTER, BLUE
+
+
+class ExampleBoxApp(toga.App):
+
+    def startup(self):
+
+        self.button_add = toga.Button(
+            label='Add image',
+            style=Pack(padding=10, width=120),
+            on_press=self.add_image,
+        )
+
+        self.button_remove = toga.Button(
+            label='Remove image',
+            style=Pack(padding=10, width=120),
+            on_press=self.remove_image,
+        )
+
+        self.button_insert = toga.Button(
+            label='Insert image',
+            style=Pack(padding=10, width=120),
+            on_press=self.insert_image,
+        )
+
+        self.button_add_to_scroll = toga.Button(
+            label='Add new label',
+            style=Pack(padding=10, width=120),
+            on_press=self.add_label,
+        )
+
+        self.scroll_box = toga.Box(style=Pack(direction=COLUMN, padding=10, flex=1, color=BLUE))
+        self.scroll_view = toga.ScrollContainer(content=self.scroll_box, style=Pack(width=120))
+
+        icon = toga.Icon('')
+        self.image_view = toga.ImageView(icon, style=Pack(padding=10, width=120, height=120))
+
+        self.button_box = toga.Box(
+            children=[
+                self.button_add,
+                self.button_remove,
+                self.button_insert,
+                self.button_add_to_scroll,
+            ],
+            style=Pack(direction=COLUMN),
+        )
+
+        self.box = toga.Box(
+            children=[self.button_box, self.scroll_view],
+            style=Pack(direction=ROW, padding=10, alignment=CENTER, flex=1)
+        )
+
+        self.main_window = toga.MainWindow()
+        self.main_window.content = self.box
+        self.main_window.show()
+
+    def add_image(self, sender):
+        self.button_box.add(self.image_view)
+
+    def insert_image(self, sender):
+        self.button_box.insert(1, self.image_view)
+
+    def remove_image(self, sender):
+        self.button_box.remove(self.image_view)
+
+    def add_label(self, sender):
+        new_label = toga.Label(
+            'Label {}'.format(len(self.scroll_box.children)),
+            style=Pack(padding=2, width=70)
+        )
+        self.scroll_box.add(new_label)
+
+
+def main():
+    return ExampleBoxApp('Layout Test', 'org.beeware.widgets.layout_test')
+
+
+if __name__ == '__main__':
+    app = main()
+    app.main_loop()

examples/layout_test/layout_test/resources/README

@@ -0,0 +1 @@
+Put any icons or images in this directory.

examples/layout_test/pyproject.toml

@@ -0,0 +1,44 @@
+[build-system]
+requires = ["briefcase"]
+
+[tool.briefcase]
+project_name = "Layout Test"
+bundle = "org.beeware"
+version = "0.0.1"
+url = "https://beeware.org"
+license = "BSD license"
+author = 'Tiberius Yak'
+author_email = "tiberius@beeware.org"
+
+[tool.briefcase.app.tayout_test]
+formal_name = "Layout Test"
+description = "A testing app"
+sources = ['tayout_test']
+requires = []
+
+
+[tool.briefcase.app.tayout_test.macOS]
+requires = [
+    'toga-cocoa',
+]
+
+[tool.briefcase.app.tayout_test.linux]
+requires = [
+    'toga-gtk',
+]
+
+[tool.briefcase.app.tayout_test.windows]
+requires = [
+    'toga-winforms',
+]
+
+# Mobile deployments
+[tool.briefcase.app.tayout_test.iOS]
+requires = [
+    'toga-iOS',
+]
+
+[tool.briefcase.app.tayout_test.android]
+requires = [
+    'toga-android',
+]

src/cocoa/toga_cocoa/constraints.py

@@ -35,39 +35,46 @@ def container(self):
 
     @container.setter
     def container(self, value):
-        self._container = value
-        # print("Add constraints for", self.widget, 'in', self.container, self.widget.interface.layout)
-        self.left_constraint = NSLayoutConstraint.constraintWithItem_attribute_relatedBy_toItem_attribute_multiplier_constant_(
-            self.widget.native, NSLayoutAttributeLeft,
-            NSLayoutRelationEqual,
-            self.container.native, NSLayoutAttributeLeft,
-            1.0, 10  # Use a dummy, non-zero value for now
-        )
-        self.container.native.addConstraint(self.left_constraint)
+        if value is None and self.container:
+            self.container.native.removeConstraint(self.width_constraint)
+            self.container.native.removeConstraint(self.height_constraint)
+            self.container.native.removeConstraint(self.left_constraint)
+            self.container.native.removeConstraint(self.top_constraint)
+            self._container = value
+        else:
+            self._container = value
+            # print("Add constraints for", self.widget, 'in', self.container, self.widget.interface.layout)
+            self.left_constraint = NSLayoutConstraint.constraintWithItem_attribute_relatedBy_toItem_attribute_multiplier_constant_(  # NOQA:E501
+                self.widget.native, NSLayoutAttributeLeft,
+                NSLayoutRelationEqual,
+                self.container.native, NSLayoutAttributeLeft,
+                1.0, 10  # Use a dummy, non-zero value for now
+            )
+            self.container.native.addConstraint(self.left_constraint)
 
-        self.top_constraint = NSLayoutConstraint.constraintWithItem_attribute_relatedBy_toItem_attribute_multiplier_constant_(
-            self.widget.native, NSLayoutAttributeTop,
-            NSLayoutRelationEqual,
-            self.container.native, NSLayoutAttributeTop,
-            1.0, 5  # Use a dummy, non-zero value for now
-        )
-        self.container.native.addConstraint(self.top_constraint)
+            self.top_constraint = NSLayoutConstraint.constraintWithItem_attribute_relatedBy_toItem_attribute_multiplier_constant_(  # NOQA:E501
+                self.widget.native, NSLayoutAttributeTop,
+                NSLayoutRelationEqual,
+                self.container.native, NSLayoutAttributeTop,
+                1.0, 5  # Use a dummy, non-zero value for now
+            )
+            self.container.native.addConstraint(self.top_constraint)
 
-        self.width_constraint = NSLayoutConstraint.constraintWithItem_attribute_relatedBy_toItem_attribute_multiplier_constant_(
-            self.widget.native, NSLayoutAttributeRight,
-            NSLayoutRelationEqual,
-            self.widget.native, NSLayoutAttributeLeft,
-            1.0, 50  # Use a dummy, non-zero value for now
-        )
-        self.container.native.addConstraint(self.width_constraint)
+            self.width_constraint = NSLayoutConstraint.constraintWithItem_attribute_relatedBy_toItem_attribute_multiplier_constant_(  # NOQA:E501
+                self.widget.native, NSLayoutAttributeRight,
+                NSLayoutRelationEqual,
+                self.widget.native, NSLayoutAttributeLeft,
+                1.0, 50  # Use a dummy, non-zero value for now
+            )
+            self.container.native.addConstraint(self.width_constraint)
 
-        self.height_constraint = NSLayoutConstraint.constraintWithItem_attribute_relatedBy_toItem_attribute_multiplier_constant_(
-            self.widget.native, NSLayoutAttributeBottom,
-            NSLayoutRelationEqual,
-            self.widget.native, NSLayoutAttributeTop,
-            1.0, 30  # Use a dummy, non-zero value for now
-        )
-        self.container.native.addConstraint(self.height_constraint)
+            self.height_constraint = NSLayoutConstraint.constraintWithItem_attribute_relatedBy_toItem_attribute_multiplier_constant_(  # NOQA:E501
+                self.widget.native, NSLayoutAttributeBottom,
+                NSLayoutRelationEqual,
+                self.widget.native, NSLayoutAttributeTop,
+                1.0, 30  # Use a dummy, non-zero value for now
+            )
+            self.container.native.addConstraint(self.height_constraint)
 
     def update(self, x, y, width, height):
         # print("UPDATE", self.widget, 'in', self.container, 'to', x, y, width, height)

src/cocoa/toga_cocoa/widgets/base.py

@@ -11,6 +11,10 @@ def __init__(self, interface):
         self.native = None
         self.create()
         self.interface.style.reapply()
+        self.set_enabled(self.interface.enabled)
+
+    def create(self):
+        raise NotImplementedError()
 
     def set_app(self, app):
         pass
@@ -24,17 +28,20 @@ def container(self):
 
     @container.setter
     def container(self, container):
-        self._container = container
-        self._container.native.addSubview(self.native)
-        self.constraints.container = container
+
+        if container is None:
+            self.constraints.container = None
+            self._container = None
+            self.native.removeFromSuperview()
+        else:
+            self._container = container
+            self._container.native.addSubview(self.native)
+            self.constraints.container = container
 
         for child in self.interface.children:
             child._impl.container = container
 
         self.rehint()
-        if self.interface.window and self.interface.window._impl.native.isVisible:
-            # refresh window content to reflect added subview
-            self.interface.window.content.refresh()
 
     def set_enabled(self, value):
         self.native.enabled = self.interface.enabled
@@ -66,7 +73,16 @@ def set_background_color(self, color):
     def add_child(self, child):
         # if we don't have a window, we won't have a container
         if self.interface.window:
-            child.container = self.container or self.interface.window.content._impl
+            # if we don't have a container, we *are* the container
+            child.container = self.container or self
+
+    def insert_child(self, index, child):
+        self.add_child(child)
+
+    def remove_child(self, child):
+        # if we don't have a window, we won't have a container
+        if self.interface.window:
+            child.container = None
 
     def add_constraints(self):
         self.native.translatesAutoresizingMaskIntoConstraints = False

src/core/toga/widgets/base.py

@@ -63,13 +63,59 @@ def add(self, *children):
             ValueError: If this node is a leaf, and cannot have children.
         """
         for child in children:
-            super().add(child)
+            if child not in self.children:
+                super().add(child)
+
+                child.app = self.app
+                child.window = self.window
+
+                if self._impl:
+                    self._impl.add_child(child._impl)
+
+        if self.window:
+            self.window.content.refresh()
+
+    def insert(self, index, child):
+        """Insert a node as a child of this one.
+        Args:
+            index: Position of child node.
+            child: A node to add as a child to this node.
+
+        Raises:
+            ValueError: If this node is a leaf, and cannot have children.
+        """
+        if child not in self.children:
+            super().insert(index, child)
 
             child.app = self.app
             child.window = self.window
 
             if self._impl:
-                self._impl.add_child(child._impl)
+                self._impl.insert_child(index, child._impl)
+
+        if self.window:
+            self.window.content.refresh()
+
+    def remove(self, *children):
+        """Remove a node as a child of this one.
+        Args:
+            child: A node to add as a child to this node.
+
+        Raises:
+            ValueError: If this node is a leaf, and cannot have children.
+        """
+        for child in children:
+            if child in self.children:
+                super().remove(child)
+
+                child.app = None
+                child.window = None
+
+                if self._impl:
+                    self._impl.remove_child(child._impl)
+
+        if self.window:
+            self.window.content.refresh()
 
     @property
     def app(self):
@@ -86,15 +132,14 @@ def app(self):
 
     @app.setter
     def app(self, app):
-        if self._app is not None:
+        if not (self._app is None or app is None):
             if self._app != app:
                 raise ValueError("Widget %s is already associated with an App" % self)
-        elif app is not None:
+        elif self._impl:
             self._app = app
             self._impl.set_app(app)
-            if self._children is not None:
-                for child in self._children:
-                    child.app = app
+            for child in self.children:
+                child.app = app
 
     @property
     def window(self):
@@ -135,10 +180,9 @@ def refresh(self):
         if self._root:
             self._root.refresh()
         else:
-            super().refresh(self._impl.viewport)
             self.refresh_sublayouts()
+            super().refresh(self._impl.viewport)
 
     def refresh_sublayouts(self):
-        if self._children is not None:
-            for child in self._children:
-                child.refresh_sublayouts()
+        for child in self.children:
+            child.refresh_sublayouts()