More bug fixes

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

diff --git a/displayio/_group.py b/displayio/_group.py
index 505a3bffb19c4f598c4a2b4e4e732e1dfb5d7efa..2c104f5a368cfb9533d5177a15c7000c86655548 100644 (file)
--- a/displayio/_group.py
+++ b/displayio/_group.py
@@ -19,14 +19,18 @@ displayio for Blinka
 
 from __future__ import annotations
 from typing import Union, Callable
 
 from __future__ import annotations
 from typing import Union, Callable

+from circuitpython_typing import WriteableBuffer

 from ._structs import TransformStruct
 from ._tilegrid import TileGrid
 from ._structs import TransformStruct
 from ._tilegrid import TileGrid

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

 
 __version__ = "0.0.0+auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 
 class Group:
 
 __version__ = "0.0.0+auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 
 class Group:

+    # pylint: disable=too-many-instance-attributes

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


@@ -47,9 +51,11 @@ class Group:
         self._group_x = x
         self._group_y = y
         self._hidden_group = False
         self._group_x = x
         self._group_y = y
         self._hidden_group = False

+        self._hidden_by_parent = False

         self._layers = []
         self._supported_types = (TileGrid, Group)
         self._in_group = False
         self._layers = []
         self._supported_types = (TileGrid, Group)
         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
 
         self._absolute_transform = TransformStruct(0, 0, 1, 1, 1, False, False, False)
         self._set_scale(scale)  # Set the scale via the setter
 


@@ -141,13 +147,22 @@ 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: WriteableBuffer,
+        buffer: 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."""
 
     def sort(self, key: Callable, reverse: bool) -> None:
         """Sort the members of the group."""


@@ -158,6 +173,35 @@ class Group:
             if isinstance(layer, (Group, TileGrid)):
                 layer._finish_refresh()  # pylint: disable=protected-access
 
             if isinstance(layer, (Group, TileGrid)):
                 layer._finish_refresh()  # pylint: disable=protected-access
 

+    def _get_refresh_areas(self, areas: list[Area]) -> None:
+        # pylint: disable=protected-access
+        for layer in self._layers:
+            if isinstance(layer, Group):
+                layer._get_refresh_areas(areas)
+            elif isinstance(layer, TileGrid):
+                if not layer._get_rendered_hidden():
+                    layer._get_refresh_areas(areas)
+
+    def _set_hidden(self, hidden: bool) -> None:
+        if self._hidden_group == hidden:
+            return
+        self._hidden_group = hidden
+        if self._hidden_by_parent:
+            return
+        for layer in self._layers:
+            if isinstance(layer, (Group, TileGrid)):
+                layer._set_hidden_by_parent(hidden)  # pylint: disable=protected-access
+
+    def _set_hidden_by_parent(self, hidden: bool) -> None:
+        if self._hidden_by_parent == hidden:
+            return
+        self._hidden_by_parent = hidden
+        if self._hidden_group:
+            return
+        for layer in self._layers:
+            if isinstance(layer, (Group, TileGrid)):
+                layer._set_hidden_by_parent(hidden)  # 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


@@ -166,10 +210,11 @@ class Group:
         return self._hidden_group
 
     @hidden.setter
         return self._hidden_group
 
     @hidden.setter

-    def hidden(self, value: bool):
+    def hidden(self, value: bool) -> None:

         if not isinstance(value, (bool, int)):
             raise ValueError("Expecting a boolean or integer value")
         if not isinstance(value, (bool, int)):
             raise ValueError("Expecting a boolean or integer value")

-        self._hidden_group = bool(value)
+        value = bool(value)
+        self._set_hidden(value)

 
     @property
     def scale(self) -> int:
 
     @property
     def scale(self) -> int:


@@ -237,3 +282,6 @@ class Group:
                 self._absolute_transform.y += dy_value * (value - self._group_y)
             self._group_y = value
             self._update_child_transforms()
                 self._absolute_transform.y += dy_value * (value - self._group_y)
             self._group_y = value
             self._update_child_transforms()

+
+
+circuitpython_splash = Group(scale=2, x=0, y=0)