Auto-layout improvements. (#135)

* Wrap NSGridView. * Solved sizing for views without intrinsic size. * Allow alignment customization. Defaults for column and row heights in special case. * Make the terminology consistent to make the doc shorter. * Documentation. * Add post-init column count manipulation. * Add post-init row count manipulation. * Add doc file. * Add support for customizing the view. Useful for testing and demos. * Move import. * Missed part of the doc process. * Add the customization to the init. * The content view isn't always the main view. Dumb oversight. * Check StackGroup to StackView and make it work more like GridView. * Import error. * Move tests.
robotools · Feb 11, 2021 · ace5871 · ace5871
1 parent 353cb6f
commit ace5871
Show file tree

Hide file tree

Showing 14 changed files with 1,188 additions and 184 deletions.
diff --git a/Documentation/source/index.rst b/Documentation/source/index.rst
@@ -38,8 +38,9 @@ Layout Views
   objects/Popover
   objects/HorizontalLine
   objects/VerticalLine
-  objects/HorizontalStackGroup
-  objects/VerticalStackGroup
+  objects/GridView
+  objects/HorizontalStackView
+  objects/VerticalStackView
 
 Data Views
 ^^^^^^^^^^

diff --git a/Documentation/source/objects/GridView.rst b/Documentation/source/objects/GridView.rst
@@ -0,0 +1,10 @@
+.. highlight:: python
+
+========
+GridView
+========
+
+.. module:: vanilla
+.. autoclass:: GridView
+   :inherited-members:
+   :members:
diff --git a/Documentation/source/objects/HorizontalStackGroup.rst b/Documentation/source/objects/HorizontalStackGroup.rst
diff --git a/Documentation/source/objects/HorizontalStackView.rst b/Documentation/source/objects/HorizontalStackView.rst
@@ -0,0 +1,10 @@
+.. highlight:: python
+
+===================
+HorizontalStackView
+===================
+
+.. module:: vanilla
+.. autoclass:: HorizontalStackView
+   :inherited-members:
+   :members:
diff --git a/Documentation/source/objects/VerticalStackGroup.rst b/Documentation/source/objects/VerticalStackGroup.rst
diff --git a/Documentation/source/objects/VerticalStackView.rst b/Documentation/source/objects/VerticalStackView.rst
@@ -0,0 +1,10 @@
+.. highlight:: python
+
+=================
+VerticalStackView
+=================
+
+.. module:: vanilla
+.. autoclass:: VerticalStackView
+   :inherited-members:
+   :members:
diff --git a/Lib/vanilla/__init__.py b/Lib/vanilla/__init__.py
@@ -9,6 +9,7 @@
 from vanilla.vanillaDrawer import Drawer
 from vanilla.vanillaEditText import EditText, SecureEditText
 from vanilla.vanillaGradientButton import GradientButton
+from vanilla.vanillaGridView import GridView
 from vanilla.vanillaGroup import Group
 from vanilla.vanillaImageView import ImageView
 from vanilla.vanillaLevelIndicator import LevelIndicator, LevelIndicatorListCell
@@ -24,6 +25,7 @@
 from vanilla.vanillaSlider import Slider
 from vanilla.vanillaSplitView import SplitView, SplitView2
 from vanilla.vanillaStackGroup import HorizontalStackGroup, VerticalStackGroup
+from vanilla.vanillaStackView import HorizontalStackView, VerticalStackView
 from vanilla.vanillaTabs import Tabs
 from vanilla.vanillaTextBox import TextBox
 from vanilla.vanillaTextEditor import TextEditor
@@ -57,7 +59,9 @@
     "Slider",
     "SplitView",
     "SplitView2",
+    "GridView",
     "HorizontalStackGroup", "VerticalStackGroup",
+    "HorizontalStackView", "VerticalStackView",
     "Tabs",
     "TextBox",
     "TextEditor",

diff --git a/Lib/vanilla/test/testAll.py b/Lib/vanilla/test/testAll.py
@@ -12,6 +12,8 @@
     from importlib import reload
     reload(vanilla)
 from vanilla import *
+from vanilla.test.testStackView import TestStackView
+from vanilla.test.testGridView import TestGridView
 
 import objc
 objc.setVerbose(True)
@@ -576,7 +578,7 @@ def buttonCallback(self, sender):
 class Test(object):
 
     def __init__(self):
-        self.w = FloatingWindow((200, 300, 120, 340))
+        self.w = FloatingWindow((200, 300, 120, 400))
         self.w.drawGrid = CheckBox((10, 10, -10, 22), "Draw Grid", value=False)
         self.w.windows = Button((10, 40, -10, 20), "Windows", callback=self.openTestCallback)
         self.w.geometry = Button((10, 70, -10, 20), "Geometry", callback=self.openTestCallback)
@@ -588,6 +590,8 @@ def __init__(self):
         self.w.toolbar = Button((10, 250, -10, 20), "Toolbar", callback=self.openTestCallback)
         self.w.misc = Button((10, 280, -10, 20), "Misc.", callback=self.openTestCallback)
         self.w.split = Button((10, 310, -10, 20), "SplitView", callback=self.openTestCallback)
+        self.w.stack = Button((10, 340, -10, 20), "StackView", callback=self.openTestCallback)
+        self.w.grid = Button((10, 370, -10, 20), "GridView", callback=self.openTestCallback)
         self.w.open()
 
     def openTestCallback(self, sender):
@@ -614,6 +618,10 @@ def openTestCallback(self, sender):
                 MiscTest(self.w.drawGrid.get())
             elif title == "SplitView":
                 TestSplitView(self.w.drawGrid.get())
+            elif title == "StackView":
+                TestStackView()
+            elif title == "GridView":
+                TestGridView()
         except:
             import traceback
             print(traceback.format_exc())