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

{adafruit_circuitpython_displayio_layout-2.2.3/adafruit_circuitpython_displayio_layout.egg-info → adafruit_circuitpython_displayio_layout-3.0.0}/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.0
 Summary: CircuitPython helper library for displayio layouts and widgets.
 Author-email: Adafruit Industries <circuitpython@adafruit.com>
 License: MIT
@@ -21,6 +21,7 @@ Requires-Dist: adafruit-circuitpython-display-text
 Requires-Dist: adafruit-circuitpython-imageload
 Requires-Dist: adafruit-circuitpython-display-shapes
 Provides-Extra: optional
+Dynamic: license-file
 
 Introduction
 ============

{adafruit_circuitpython_displayio_layout-2.2.3 → adafruit_circuitpython_displayio_layout-3.0.0/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.0
 Summary: CircuitPython helper library for displayio layouts and widgets.
 Author-email: Adafruit Industries <circuitpython@adafruit.com>
 License: MIT
@@ -21,6 +21,7 @@ Requires-Dist: adafruit-circuitpython-display-text
 Requires-Dist: adafruit-circuitpython-imageload
 Requires-Dist: adafruit-circuitpython-display-shapes
 Provides-Extra: optional
+Dynamic: license-file
 
 Introduction
 ============

{adafruit_circuitpython_displayio_layout-2.2.3 → adafruit_circuitpython_displayio_layout-3.0.0}/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.0"
 __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.0}/adafruit_displayio_layout/layouts/page_layout.py

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

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

@@ -40,7 +40,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.0"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

{adafruit_circuitpython_displayio_layout-2.2.3 → adafruit_circuitpython_displayio_layout-3.0.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.2.3"
+version = "3.0.0"
 readme = "README.rst"
 authors = [
     {name = "Adafruit Industries", email = "circuitpython@adafruit.com"}