adafruit-circuitpython-displayio-layout 2.2.3__tar.gz → 3.0.1__tar.gz

{adafruit_circuitpython_displayio_layout-2.2.3/adafruit_circuitpython_displayio_layout.egg-info → adafruit_circuitpython_displayio_layout-3.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: adafruit-circuitpython-displayio-layout
-Version: 2.2.3
+Version: 3.0.1
 Summary: CircuitPython helper library for displayio layouts and widgets.
 Author-email: Adafruit Industries <circuitpython@adafruit.com>
 License: MIT
@@ -20,7 +20,9 @@ Requires-Dist: adafruit-circuitpython-bitmap-font
 Requires-Dist: adafruit-circuitpython-display-text
 Requires-Dist: adafruit-circuitpython-imageload
 Requires-Dist: adafruit-circuitpython-display-shapes
+Requires-Dist: adafruit-circuitpython-typing
 Provides-Extra: optional
+Dynamic: license-file
 
 Introduction
 ============

{adafruit_circuitpython_displayio_layout-2.2.3 → adafruit_circuitpython_displayio_layout-3.0.1/adafruit_circuitpython_displayio_layout.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: adafruit-circuitpython-displayio-layout
-Version: 2.2.3
+Version: 3.0.1
 Summary: CircuitPython helper library for displayio layouts and widgets.
 Author-email: Adafruit Industries <circuitpython@adafruit.com>
 License: MIT
@@ -20,7 +20,9 @@ Requires-Dist: adafruit-circuitpython-bitmap-font
 Requires-Dist: adafruit-circuitpython-display-text
 Requires-Dist: adafruit-circuitpython-imageload
 Requires-Dist: adafruit-circuitpython-display-shapes
+Requires-Dist: adafruit-circuitpython-typing
 Provides-Extra: optional
+Dynamic: license-file
 
 Introduction
 ============

{adafruit_circuitpython_displayio_layout-2.2.3 → adafruit_circuitpython_displayio_layout-3.0.1}/adafruit_circuitpython_displayio_layout.egg-info/requires.txt

@@ -4,5 +4,6 @@ adafruit-circuitpython-bitmap-font
 adafruit-circuitpython-display-text
 adafruit-circuitpython-imageload
 adafruit-circuitpython-display-shapes
+adafruit-circuitpython-typing
 
 [optional]

{adafruit_circuitpython_displayio_layout-2.2.3 → adafruit_circuitpython_displayio_layout-3.0.1}/adafruit_displayio_layout/layouts/grid_layout.py

@@ -34,7 +34,7 @@ import math
 import displayio
 from vectorio import Rectangle
 
-__version__ = "2.2.3"
+__version__ = "3.0.1"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 
@@ -393,31 +393,63 @@ class GridLayout(displayio.Group):
         if layout_cells:
             self._layout_cells()
 
-    def get_cell(self, cell_coordinates: Tuple[int, int]) -> displayio.Group:
+    def get_content(self, grid_position: Tuple[int, int]) -> displayio.Group:
         """
-        Return a cells content based on the cell_coordinates. Raises
+        Return a cells content based on the grid_position. Raises
         KeyError if coordinates were not found in the GridLayout.
 
-        :param tuple cell_coordinates: the coordinates to lookup in the grid
+        :param tuple grid_position: the coordinates to lookup in the grid
         :return: the displayio content object at those coordinates
         """
         for index, cell in enumerate(self._cell_content_list):
             # exact location 1x1 cell
-            if cell["grid_position"] == cell_coordinates:
+            if cell["grid_position"] == grid_position:
                 return self._cell_content_list[index]["content"]
 
             # multi-spanning cell, any size bigger than 1x1
             if (
                 cell["grid_position"][0]
-                <= cell_coordinates[0]
+                <= grid_position[0]
                 < cell["grid_position"][0] + cell["cell_size"][0]
                 and cell["grid_position"][1]
-                <= cell_coordinates[1]
+                <= grid_position[1]
                 < cell["grid_position"][1] + cell["cell_size"][1]
             ):
                 return self._cell_content_list[index]["content"]
 
-        raise KeyError(f"GridLayout does not contain cell at coordinates {cell_coordinates}")
+        raise KeyError(f"GridLayout does not contain content at coordinates {grid_position}")
+
+    def pop_content(self, grid_position: Tuple[int, int]) -> None:
+        """
+        Remove and return a cells content based on the grid_position. Raises
+        KeyError if coordinates were not found in the GridLayout.
+
+        :param tuple grid_position: the coordinates to lookup in the grid
+        :return: the displayio content object at those coordinates
+        """
+        for index, cell in enumerate(self._cell_content_list):
+            # exact location 1x1 cell
+            if cell["grid_position"] == grid_position:
+                _found = self._cell_content_list.pop(index)
+                self._layout_cells()
+                self.remove(_found["content"])
+                return _found["content"]
+
+            # multi-spanning cell, any size bigger than 1x1
+            if (
+                cell["grid_position"][0]
+                <= grid_position[0]
+                < cell["grid_position"][0] + cell["cell_size"][0]
+                and cell["grid_position"][1]
+                <= grid_position[1]
+                < cell["grid_position"][1] + cell["cell_size"][1]
+            ):
+                _found = self._cell_content_list.pop(index)
+                self._layout_cells()
+                self.remove(_found["content"])
+                return _found["content"]
+
+        raise KeyError(f"GridLayout does not contain content at coordinates {grid_position}")
 
     @property
     def cell_size_pixels(self) -> Tuple[int, int]:

{adafruit_circuitpython_displayio_layout-2.2.3 → adafruit_circuitpython_displayio_layout-3.0.1}/adafruit_displayio_layout/layouts/page_layout.py

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

{adafruit_circuitpython_displayio_layout-2.2.3 → adafruit_circuitpython_displayio_layout-3.0.1}/adafruit_displayio_layout/layouts/tab_layout.py

@@ -28,6 +28,7 @@ try:
 
     from adafruit_bitmap_font.bdf import BDF
     from adafruit_bitmap_font.pcf import PCF
+    from circuitpython_typing.displayio import AnyDisplay
     from fontio import BuiltinFont
 except ImportError:
     pass
@@ -40,7 +41,7 @@ from adafruit_imageload.tilegrid_inflator import inflate_tilegrid
 
 from adafruit_displayio_layout.layouts.page_layout import PageLayout
 
-__version__ = "2.2.3"
+__version__ = "3.0.1"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 
@@ -53,7 +54,7 @@ class TabLayout(displayio.Group):
 
     :param int x: x location the layout should be placed. Pixel coordinates.
     :param int y: y location the layout should be placed. Pixel coordinates.
-    :param displayio.Display display: The Display object to show the tab layout on.
+    :param AnyDisplay display: The Display object to show the tab layout on.
     :param int tab_text_scale: Size of the text shown in the tabs.
       Whole numbers 1 and greater are valid
     :param Optional[Union[BuiltinFont, BDF, PCF]] custom_font: A pre-loaded font object to use
@@ -75,7 +76,7 @@ class TabLayout(displayio.Group):
         self,
         x: int = 0,
         y: int = 0,
-        display: Optional[displayio.Display] = None,
+        display: Optional[AnyDisplay] = None,
         tab_text_scale: int = 1,
         custom_font: Optional[Union[BuiltinFont, BDF, PCF]] = terminalio.FONT,
         inactive_tab_spritesheet: Optional[str] = None,

{adafruit_circuitpython_displayio_layout-2.2.3 → adafruit_circuitpython_displayio_layout-3.0.1}/adafruit_displayio_layout/widgets/cartesian.py

@@ -39,7 +39,7 @@ except ImportError:
     pass
 
 
-__version__ = "2.2.3"
+__version__ = "3.0.1"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 

{adafruit_circuitpython_displayio_layout-2.2.3 → adafruit_circuitpython_displayio_layout-3.0.1}/adafruit_displayio_layout/widgets/control.py

@@ -27,7 +27,7 @@ except ImportError:
     pass
 
 
-__version__ = "2.2.3"
+__version__ = "3.0.1"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 

{adafruit_circuitpython_displayio_layout-2.2.3 → adafruit_circuitpython_displayio_layout-3.0.1}/adafruit_displayio_layout/widgets/easing.py

@@ -75,7 +75,7 @@ Implementation Notes
 
 import math
 
-__version__ = "2.2.3"
+__version__ = "3.0.1"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 

{adafruit_circuitpython_displayio_layout-2.2.3 → adafruit_circuitpython_displayio_layout-3.0.1}/adafruit_displayio_layout/widgets/flip_input.py

@@ -38,11 +38,13 @@ from adafruit_displayio_layout.widgets.widget import Widget
 
 try:
     from typing import Any, List, Optional, Tuple
+
+    from circuitpython_typing.displayio import AnyDisplay
 except ImportError:
     pass
 
 
-__version__ = "2.2.3"
+__version__ = "3.0.1"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 
@@ -54,7 +56,7 @@ class FlipInput(Widget, Control):
     :param int x: pixel position
     :param int y: pixel position
 
-    :param displayio.Display display: the display where the widget will be displayed
+    :param AnyDisplay display: the display where the widget will be displayed
     :param value_list: the list of strings that will be displayed
     :type value_list: List[str]
     :param Font font: the font used for the text (defaults to ``terminalio.FONT``)
@@ -87,7 +89,7 @@ class FlipInput(Widget, Control):
 
     def __init__(
         self,
-        display: displayio.Display,
+        display: AnyDisplay,
         *,
         value_list: List[str],
         font: FONT = FONT,
@@ -586,7 +588,7 @@ def _blit_constrained(
 
 # _animate_bitmap - performs animation of scrolling between two bitmaps
 def _animate_bitmap(
-    display: displayio.Display,
+    display: AnyDisplay,
     target_bitmap: displayio.Bitmap,
     bitmap1: displayio.Bitmap,
     bitmap1_offset: Tuple[int, int],

{adafruit_circuitpython_displayio_layout-2.2.3 → adafruit_circuitpython_displayio_layout-3.0.1}/adafruit_displayio_layout/widgets/icon_animated.py

@@ -37,12 +37,12 @@ from adafruit_displayio_layout.widgets.icon_widget import IconWidget
 try:
     from typing import Any, Optional, Tuple
 
-    from busdisplay import BusDisplay
+    from circuitpython_typing.displayio import AnyDisplay
 except ImportError:
     pass
 
 
-__version__ = "2.2.3"
+__version__ = "3.0.1"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 
@@ -86,7 +86,7 @@ class IconAnimated(IconWidget):
     @classmethod
     def init_class(
         cls,
-        display: Optional[BusDisplay],
+        display: Optional[AnyDisplay],
         max_scale: float = 1.5,
         max_icon_size: Tuple[int, int] = (80, 80),
         max_color_depth: int = 256,
@@ -100,7 +100,7 @@ class IconAnimated(IconWidget):
                 ``IconAnimated.init_class(display=board.DISPLAY, max_scale=1.5,
                 max_icon_size=(80,80), max_color_depth=256)``
 
-        :param displayio.Display display: The display where the icons will be displayed.
+        :param AnyDisplay display: The display where the icons will be displayed.
         :param float max_scale: The maximum zoom of the any of the icons, should be >= 1.0,
          (default: 1.5)
         :param max_icon_size: The maximum (x,y) pixel dimensions of any `IconAnimated` bitmap size

{adafruit_circuitpython_displayio_layout-2.2.3 → adafruit_circuitpython_displayio_layout-3.0.1}/adafruit_displayio_layout/widgets/icon_widget.py

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

{adafruit_circuitpython_displayio_layout-2.2.3 → adafruit_circuitpython_displayio_layout-3.0.1}/adafruit_displayio_layout/widgets/switch_round.py

@@ -52,7 +52,7 @@ except ImportError:
     pass
 
 
-__version__ = "2.2.3"
+__version__ = "3.0.1"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 

{adafruit_circuitpython_displayio_layout-2.2.3 → adafruit_circuitpython_displayio_layout-3.0.1}/adafruit_displayio_layout/widgets/widget.py

@@ -30,7 +30,7 @@ except ImportError:
     pass
 
 
-__version__ = "2.2.3"
+__version__ = "3.0.1"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 

{adafruit_circuitpython_displayio_layout-2.2.3 → adafruit_circuitpython_displayio_layout-3.0.1}/pyproject.toml

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

{adafruit_circuitpython_displayio_layout-2.2.3 → adafruit_circuitpython_displayio_layout-3.0.1}/requirements.txt

@@ -8,3 +8,4 @@ adafruit-circuitpython-bitmap-font
 adafruit-circuitpython-display-text
 adafruit-circuitpython-imageload
 adafruit-circuitpython-display-shapes
+adafruit-circuitpython-typing