adafruit-circuitpython-displayio-layout 2.1.0__tar.gz → 2.2.0__tar.gz

{adafruit-circuitpython-displayio-layout-2.1.0/adafruit_circuitpython_displayio_layout.egg-info → adafruit_circuitpython_displayio_layout-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: adafruit-circuitpython-displayio-layout
-Version: 2.1.0
+Version: 2.2.0
 Summary: CircuitPython helper library for displayio layouts and widgets.
 Author-email: Adafruit Industries <circuitpython@adafruit.com>
 License: MIT

{adafruit-circuitpython-displayio-layout-2.1.0 → adafruit_circuitpython_displayio_layout-2.2.0/adafruit_circuitpython_displayio_layout.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: adafruit-circuitpython-displayio-layout
-Version: 2.1.0
+Version: 2.2.0
 Summary: CircuitPython helper library for displayio layouts and widgets.
 Author-email: Adafruit Industries <circuitpython@adafruit.com>
 License: MIT

{adafruit-circuitpython-displayio-layout-2.1.0 → adafruit_circuitpython_displayio_layout-2.2.0}/adafruit_circuitpython_displayio_layout.egg-info/SOURCES.txt

@@ -26,6 +26,7 @@ adafruit_circuitpython_displayio_layout.egg-info/top_level.txt
 adafruit_displayio_layout/__init__.py
 adafruit_displayio_layout/layouts/__init__.py
 adafruit_displayio_layout/layouts/grid_layout.py
+adafruit_displayio_layout/layouts/linear_layout.py
 adafruit_displayio_layout/layouts/page_layout.py
 adafruit_displayio_layout/layouts/tab_layout.py
 adafruit_displayio_layout/widgets/__init__.py
@@ -64,6 +65,7 @@ examples/displayio_layout_gridlayout_dividers.py
 examples/displayio_layout_gridlayout_pygame_display_simpletest.py
 examples/displayio_layout_gridlayout_simpletest.py
 examples/displayio_layout_icon_animated_simpletest.py
+examples/displayio_layout_linearlayout_simpletest.py
 examples/displayio_layout_page_layout_advancedtest.py
 examples/displayio_layout_page_layout_simpletest.py
 examples/displayio_layout_pygame_display_switch_round.py

{adafruit-circuitpython-displayio-layout-2.1.0 → adafruit_circuitpython_displayio_layout-2.2.0}/adafruit_displayio_layout/layouts/grid_layout.py

@@ -32,7 +32,7 @@ import math
 import displayio
 from vectorio import Rectangle
 
-__version__ = "2.1.0"
+__version__ = "2.2.0"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 

adafruit_circuitpython_displayio_layout-2.2.0/adafruit_displayio_layout/layouts/linear_layout.py

@@ -0,0 +1,151 @@
+# SPDX-FileCopyrightText: Copyright (c) 2021 Tim Cocks
+#
+# SPDX-License-Identifier: MIT
+"""
+`linear_layout`
+================================================================================
+
+A layout that organizes cells into a vertical or horizontal line.
+
+
+* Author(s): Tim Cocks
+
+Implementation Notes
+--------------------
+
+**Hardware:**
+
+**Software and Dependencies:**
+
+* Adafruit CircuitPython firmware for the supported boards:
+  https://github.com/adafruit/circuitpython/releases
+
+"""
+
+from adafruit_displayio_layout.widgets.widget import Widget
+
+
+class LinearLayout(Widget):
+    """
+    LinearLayout holds multiple content elements and arranges
+    them in a line either horizontally or vertically.
+    """
+
+    VERTICAL_ORIENTATION = 1
+    HORIZONTAL_ORIENTATION = 2
+
+    def __init__(
+        self,
+        x,
+        y,
+        orientation=VERTICAL_ORIENTATION,
+        padding=0,
+    ):
+        """
+        :param int x: The horizontal position of the layout
+        :param int y: The vertical position of the layout
+        :param int orientation: The orientation of the layout. Must be VERTICAL_ORIENTATION
+         or HORIZONTAL_ORIENTATION
+        :param int padding: The padding between items in the layout
+        """
+
+        super().__init__(x=x, y=y, width=1, height=1)
+
+        self.x = x
+        self.y = y
+        self.padding = padding
+        if orientation not in [self.VERTICAL_ORIENTATION, self.HORIZONTAL_ORIENTATION]:
+            raise ValueError(
+                "Orientation must be either LinearLayout.VERTICAL_ORIENTATION"
+                " or LinearLayout.HORIZONTAL_ORIENTATION"
+            )
+
+        self.orientation = orientation
+        self._content_list = []
+        self._prev_content_end = 0
+
+    def add_content(self, content):
+        """Add a child to the linear layout.
+
+        :param content: the content to add to the linear layout e.g. label, button, etc...
+         Group subclasses that have width and height properties can be used.
+
+        :return: None"""
+
+        self._content_list.append(content)
+        self.append(content)
+        self._layout()
+
+    def _layout(self):
+        # pylint: disable=too-many-branches, protected-access
+        self._prev_content_end = 0
+
+        for _, content in enumerate(self._content_list):
+            if not hasattr(content, "anchor_point"):
+                if self.orientation == self.VERTICAL_ORIENTATION:
+                    content.y = self._prev_content_end
+                    try:
+                        self._prev_content_end = (
+                            self._prev_content_end + content.height + self.padding
+                        )
+                    except AttributeError as error:
+                        print(error)
+                        try:
+                            self._prev_content_end = (
+                                self._prev_content_end + content._height + self.padding
+                            )
+                        except AttributeError as inner_error:
+                            print(inner_error)
+
+                else:
+                    content.x = self._prev_content_end
+                    if not hasattr(content, "tile_width"):
+                        self._prev_content_end = (
+                            content.x + content.width + (self.padding * 2)
+                        )
+                    else:
+                        self._prev_content_end = (
+                            content.x
+                            + (content.width * content.tile_width)
+                            + (self.padding * 2)
+                        )
+            else:  # use anchor point
+                content.anchor_point = (
+                    0,
+                    content.anchor_point[1] if content.anchor_point is not None else 0,
+                )
+                if self.orientation == self.VERTICAL_ORIENTATION:
+                    content.anchored_position = (0, self._prev_content_end)
+                    # self._prev_content_end = content.y + content.height
+                    if not hasattr(content, "bounding_box"):
+                        self._prev_content_end = (
+                            self._prev_content_end + content.height + self.padding
+                        )
+                    else:
+                        self._prev_content_end = (
+                            self._prev_content_end
+                            + (content.bounding_box[3] * content.scale)
+                            + self.padding
+                        )
+
+                else:
+                    original_achored_pos_y = (
+                        content.anchored_position[1]
+                        if content.anchored_position is not None
+                        else 0
+                    )
+
+                    content.anchored_position = (
+                        self._prev_content_end,
+                        original_achored_pos_y,
+                    )
+                    if not hasattr(content, "bounding_box"):
+                        self._prev_content_end = (
+                            self._prev_content_end + content.width + self.padding
+                        )
+                    else:
+                        self._prev_content_end = (
+                            self._prev_content_end
+                            + (content.bounding_box[2] * content.scale)
+                            + self.padding
+                        )

{adafruit-circuitpython-displayio-layout-2.1.0 → adafruit_circuitpython_displayio_layout-2.2.0}/adafruit_displayio_layout/layouts/page_layout.py

@@ -32,7 +32,7 @@ except ImportError:
 
 import displayio
 
-__version__ = "2.1.0"
+__version__ = "2.2.0"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 

{adafruit-circuitpython-displayio-layout-2.1.0 → adafruit_circuitpython_displayio_layout-2.2.0}/adafruit_displayio_layout/layouts/tab_layout.py

@@ -37,7 +37,7 @@ from adafruit_display_text.bitmap_label import Label
 from adafruit_imageload.tilegrid_inflator import inflate_tilegrid
 from adafruit_displayio_layout.layouts.page_layout import PageLayout
 
-__version__ = "2.1.0"
+__version__ = "2.2.0"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 

{adafruit-circuitpython-displayio-layout-2.1.0 → adafruit_circuitpython_displayio_layout-2.2.0}/adafruit_displayio_layout/widgets/cartesian.py

@@ -41,7 +41,7 @@ except ImportError:
     pass
 
 
-__version__ = "2.1.0"
+__version__ = "2.2.0"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 

{adafruit-circuitpython-displayio-layout-2.1.0 → adafruit_circuitpython_displayio_layout-2.2.0}/adafruit_displayio_layout/widgets/control.py

@@ -27,7 +27,7 @@ except ImportError:
     pass
 
 
-__version__ = "2.1.0"
+__version__ = "2.2.0"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 # pylint: disable=unsubscriptable-object, unnecessary-pass

{adafruit-circuitpython-displayio-layout-2.1.0 → adafruit_circuitpython_displayio_layout-2.2.0}/adafruit_displayio_layout/widgets/easing.py

@@ -76,7 +76,7 @@ Implementation Notes
 import math
 
 
-__version__ = "2.1.0"
+__version__ = "2.2.0"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 

{adafruit-circuitpython-displayio-layout-2.1.0 → adafruit_circuitpython_displayio_layout-2.2.0}/adafruit_displayio_layout/widgets/flip_input.py

@@ -44,7 +44,7 @@ except ImportError:
     pass
 
 
-__version__ = "2.1.0"
+__version__ = "2.2.0"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 

{adafruit-circuitpython-displayio-layout-2.1.0 → adafruit_circuitpython_displayio_layout-2.2.0}/adafruit_displayio_layout/widgets/icon_animated.py

@@ -38,7 +38,7 @@ except ImportError:
     pass
 
 
-__version__ = "2.1.0"
+__version__ = "2.2.0"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 

{adafruit-circuitpython-displayio-layout-2.1.0 → adafruit_circuitpython_displayio_layout-2.2.0}/adafruit_displayio_layout/widgets/icon_widget.py

@@ -36,7 +36,7 @@ except ImportError:
     pass
 
 
-__version__ = "2.1.0"
+__version__ = "2.2.0"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 

{adafruit-circuitpython-displayio-layout-2.1.0 → adafruit_circuitpython_displayio_layout-2.2.0}/adafruit_displayio_layout/widgets/switch_round.py

@@ -50,7 +50,7 @@ except ImportError:
     pass
 
 
-__version__ = "2.1.0"
+__version__ = "2.2.0"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 

{adafruit-circuitpython-displayio-layout-2.1.0 → adafruit_circuitpython_displayio_layout-2.2.0}/adafruit_displayio_layout/widgets/widget.py

@@ -30,7 +30,7 @@ except ImportError:
     pass
 
 
-__version__ = "2.1.0"
+__version__ = "2.2.0"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 # pylint: disable=too-many-arguments

{adafruit-circuitpython-displayio-layout-2.1.0 → adafruit_circuitpython_displayio_layout-2.2.0}/docs/conf.py

@@ -118,7 +118,6 @@ napoleon_numpy_docstring = False
 import sphinx_rtd_theme
 
 html_theme = "sphinx_rtd_theme"
-html_theme_path = [sphinx_rtd_theme.get_html_theme_path(), "."]
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,

adafruit_circuitpython_displayio_layout-2.2.0/examples/displayio_layout_linearlayout_simpletest.py

@@ -0,0 +1,37 @@
+# SPDX-FileCopyrightText: 2024 Tim C, written for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+"""
+Illustrates usage of LinearLayout to display a text label to the right of
+an icon.
+"""
+import adafruit_imageload
+import board
+import displayio
+import terminalio
+from adafruit_display_text import label
+from adafruit_displayio_layout.layouts.linear_layout import LinearLayout
+
+# use built in display (PyPortal, PyGamer, PyBadge, CLUE, etc.)
+# see guide for setting up external displays (TFT / OLED breakouts, RGB matrices, etc.)
+# https://learn.adafruit.com/circuitpython-display-support-using-displayio/display-and-display-bus
+display = board.DISPLAY
+
+# Make the display context
+main_group = displayio.Group()
+display.root_group = main_group
+
+layout = LinearLayout(
+    x=10, y=10, padding=4, orientation=LinearLayout.HORIZONTAL_ORIENTATION
+)
+
+lbl = label.Label(terminalio.FONT, scale=4, x=0, y=0, text="Hello")
+
+icon, icon_palette = adafruit_imageload.load("icons/Play_48x48_small.bmp")
+icon_tile_grid = displayio.TileGrid(icon, pixel_shader=icon_palette)
+layout.add_content(icon_tile_grid)
+layout.add_content(lbl)
+
+main_group.append(layout)
+while True:
+    pass

{adafruit-circuitpython-displayio-layout-2.1.0 → adafruit_circuitpython_displayio_layout-2.2.0}/pyproject.toml

@@ -12,7 +12,7 @@ requires = [
 [project]
 name = "adafruit-circuitpython-displayio-layout"
 description = "CircuitPython helper library for displayio layouts and widgets."
-version = "2.1.0"
+version = "2.2.0"
 readme = "README.rst"
 authors = [
     {name = "Adafruit Industries", email = "circuitpython@adafruit.com"}