Fixed buffer and get_refresh_areas

[hackapet/Adafruit_Blinka_Displayio.git] / displayio / _group.py

diff --git a/displayio/_group.py b/displayio/_group.py
index 6be7c6fb0974602d98e54a0becb6e1d1cd83f018..ed90f8e105a1f705f9bb7d6190ddb4be4587bedb 100644 (file)
--- a/displayio/_group.py
+++ b/displayio/_group.py
@@ -19,16 +19,16 @@ displayio for Blinka
 
 from __future__ import annotations
 from typing import Union, Callable
 
 from __future__ import annotations
 from typing import Union, Callable

-from recordclass import recordclass
+import circuitpython_typing
+from ._structs import TransformStruct

 from ._tilegrid import TileGrid
 from ._tilegrid import TileGrid

+from ._colorspace import Colorspace
+from ._area import Area

 
 

-__version__ = "0.0.0-auto.0"
+__version__ = "0.0.0+auto.0"

 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 

-Transform = recordclass("Transform", "x y dx dy scale transpose_xy mirror_x mirror_y")
-
-

 class Group:
     """
     Manage a group of sprites and groups and how they are inter-related.
 class Group:
     """
     Manage a group of sprites and groups and how they are inter-related.


@@ -52,14 +52,15 @@ class Group:
         self._hidden_group = False
         self._layers = []
         self._supported_types = (TileGrid, Group)
         self._hidden_group = False
         self._layers = []
         self._supported_types = (TileGrid, Group)

-        self.in_group = False
-        self._absolute_transform = Transform(0, 0, 1, 1, 1, False, False, False)
+        self._in_group = False
+        self._item_removed = False
+        self._absolute_transform = TransformStruct(0, 0, 1, 1, 1, False, False, False)

         self._set_scale(scale)  # Set the scale via the setter
 
     def _update_transform(self, parent_transform):
         """Update the parent transform and child transforms"""
         self._set_scale(scale)  # Set the scale via the setter
 
     def _update_transform(self, parent_transform):
         """Update the parent transform and child transforms"""

-        self.in_group = parent_transform is not None
-        if self.in_group:
+        self._in_group = parent_transform is not None
+        if self._in_group:

             x = self._group_x
             y = self._group_y
             if parent_transform.transpose_xy:
             x = self._group_x
             y = self._group_y
             if parent_transform.transpose_xy:


@@ -76,7 +77,7 @@ class Group:
 
     def _update_child_transforms(self):
         # pylint: disable=protected-access
 
     def _update_child_transforms(self):
         # pylint: disable=protected-access

-        if self.in_group:
+        if self._in_group:

             for layer in self._layers:
                 layer._update_transform(self._absolute_transform)
 
             for layer in self._layers:
                 layer._update_transform(self._absolute_transform)
 


@@ -100,7 +101,7 @@ class Group:
         """Insert a layer into the group."""
         if not isinstance(layer, self._supported_types):
             raise ValueError("Invalid Group Member")
         """Insert a layer into the group."""
         if not isinstance(layer, self._supported_types):
             raise ValueError("Invalid Group Member")

-        if layer.in_group:
+        if layer._in_group:  # pylint: disable=protected-access

             raise ValueError("Layer already in a group.")
         self._layers.insert(index, layer)
         self._layer_update(index)
             raise ValueError("Layer already in a group.")
         self._layers.insert(index, layer)
         self._layer_update(index)


@@ -144,18 +145,39 @@ class Group:
         """Deletes the value at the given index."""
         del self._layers[index]
 
         """Deletes the value at the given index."""
         del self._layers[index]
 

-    def _fill_area(self, buffer):
+    def _fill_area(
+        self,
+        colorspace: Colorspace,
+        area: Area,
+        mask: circuitpython_typing.WriteableBuffer,
+        buffer: circuitpython_typing.WriteableBuffer,
+    ) -> bool:

         if self._hidden_group:
         if self._hidden_group:

-            return
+            return False

 
         for layer in self._layers:
             if isinstance(layer, (Group, TileGrid)):
 
         for layer in self._layers:
             if isinstance(layer, (Group, TileGrid)):

-                layer._fill_area(buffer)  # pylint: disable=protected-access
+                if layer._fill_area(  # pylint: disable=protected-access
+                    colorspace, area, mask, buffer
+                ):
+                    return True
+        return False

 
     def sort(self, key: Callable, reverse: bool) -> None:
         """Sort the members of the group."""
         self._layers.sort(key=key, reverse=reverse)
 
 
     def sort(self, key: Callable, reverse: bool) -> None:
         """Sort the members of the group."""
         self._layers.sort(key=key, reverse=reverse)
 

+    def _finish_refresh(self):
+        for layer in self._layers:
+            if isinstance(layer, (Group, TileGrid)):
+                layer._finish_refresh()  # pylint: disable=protected-access
+
+    def _get_refresh_areas(self, areas: list[Area]) -> None:
+        for layer in self._layers:
+            if isinstance(layer, (Group, TileGrid)):
+                if not layer.hidden:
+                    layer._get_refresh_areas(areas)  # pylint: disable=protected-access
+

     @property
     def hidden(self) -> bool:
         """True when the Group and all of it's layers are not visible. When False, the
     @property
     def hidden(self) -> bool:
         """True when the Group and all of it's layers are not visible. When False, the