X-Git-Url: https://git.ayoreis.com/hackapet/Adafruit_Blinka_Displayio.git/blobdiff_plain/a53c930973a24a7c55db9448e45d7ca7974cb56e..HEAD:/displayio/_group.py diff --git a/displayio/_group.py b/displayio/_group.py index 2c104f5..2d858e6 100644 --- a/displayio/_group.py +++ b/displayio/_group.py @@ -20,6 +20,7 @@ displayio for Blinka from __future__ import annotations from typing import Union, Callable from circuitpython_typing import WriteableBuffer +from vectorio._rectangle import _VectorShape from ._structs import TransformStruct from ._tilegrid import TileGrid from ._colorspace import Colorspace @@ -48,12 +49,13 @@ class Group: if not isinstance(scale, int) or scale < 1: raise ValueError("Scale must be >= 1") self._scale = 1 # Use the setter below to actually set the scale + self._name = "Group" 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._supported_types = (TileGrid, Group, _VectorShape) self._in_group = False self._item_removed = False self._absolute_transform = TransformStruct(0, 0, 1, 1, 1, False, False, False) @@ -67,8 +69,12 @@ class Group: y = self._group_y if parent_transform.transpose_xy: x, y = y, x - self._absolute_transform.x = parent_transform.x + parent_transform.dx * x - self._absolute_transform.y = parent_transform.y + parent_transform.dy * y + self._absolute_transform.x = int( + parent_transform.x + parent_transform.dx * x + ) + self._absolute_transform.y = int( + parent_transform.y + parent_transform.dy * y + ) self._absolute_transform.dx = parent_transform.dx * self._scale self._absolute_transform.dy = parent_transform.dy * self._scale self._absolute_transform.transpose_xy = parent_transform.transpose_xy @@ -93,33 +99,34 @@ class Group: layer = self._layers[index] layer._update_transform(self._absolute_transform) - def append(self, layer: Union[Group, TileGrid]) -> None: + def append(self, layer: Union[Group, TileGrid, _VectorShape]) -> None: """Append a layer to the group. It will be drawn above other layers. """ self.insert(len(self._layers), layer) - def insert(self, index: int, layer: Union[Group, TileGrid]) -> None: + def insert(self, index: int, layer: Union[Group, TileGrid, _VectorShape]) -> None: """Insert a layer into the group.""" if not isinstance(layer, self._supported_types): raise ValueError("Invalid Group Member") - if layer._in_group: # pylint: disable=protected-access - raise ValueError("Layer already in a group.") + if isinstance(layer, (Group, TileGrid)): + if layer._in_group: # pylint: disable=protected-access + raise ValueError("Layer already in a group.") self._layers.insert(index, layer) self._layer_update(index) - def index(self, layer: Union[Group, TileGrid]) -> int: + def index(self, layer: Union[Group, TileGrid, _VectorShape]) -> int: """Returns the index of the first copy of layer. Raises ValueError if not found. """ return self._layers.index(layer) - def pop(self, index: int = -1) -> Union[Group, TileGrid]: + def pop(self, index: int = -1) -> Union[Group, TileGrid, _VectorShape]: """Remove the ith item and return it.""" self._removal_cleanup(index) return self._layers.pop(index) - def remove(self, layer: Union[Group, TileGrid]) -> None: + def remove(self, layer: Union[Group, TileGrid, _VectorShape]) -> None: """Remove the first copy of layer. Raises ValueError if it is not present.""" index = self.index(layer) @@ -133,11 +140,13 @@ class Group: """Returns the number of layers in a Group""" return len(self._layers) - def __getitem__(self, index: int) -> Union[Group, TileGrid]: + def __getitem__(self, index: int) -> Union[Group, TileGrid, _VectorShape]: """Returns the value at the given index.""" return self._layers[index] - def __setitem__(self, index: int, value: Union[Group, TileGrid]) -> None: + def __setitem__( + self, index: int, value: Union[Group, TileGrid, _VectorShape] + ) -> None: """Sets the value at the given index.""" self._removal_cleanup(index) self._layers[index] = value @@ -154,14 +163,13 @@ class Group: mask: WriteableBuffer, buffer: WriteableBuffer, ) -> bool: - if self._hidden_group: - return False - for layer in self._layers: - if isinstance(layer, (Group, TileGrid)): - if layer._fill_area( # pylint: disable=protected-access - colorspace, area, mask, buffer - ): - return True + if not self._hidden_group: + for layer in reversed(self._layers): + if isinstance(layer, (Group, TileGrid, _VectorShape)): + if layer._fill_area( # pylint: disable=protected-access + colorspace, area, mask, buffer + ): + return True return False def sort(self, key: Callable, reverse: bool) -> None: @@ -169,14 +177,14 @@ class Group: self._layers.sort(key=key, reverse=reverse) def _finish_refresh(self): - for layer in self._layers: - if isinstance(layer, (Group, TileGrid)): + for layer in reversed(self._layers): + if isinstance(layer, (Group, TileGrid, _VectorShape)): 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): + for layer in reversed(self._layers): + if isinstance(layer, (Group, _VectorShape)): layer._get_refresh_areas(areas) elif isinstance(layer, TileGrid): if not layer._get_rendered_hidden(): @@ -191,6 +199,8 @@ class Group: for layer in self._layers: if isinstance(layer, (Group, TileGrid)): layer._set_hidden_by_parent(hidden) # pylint: disable=protected-access + elif isinstance(layer, _VectorShape): + layer._shape_set_dirty() # pylint: disable=protected-access def _set_hidden_by_parent(self, hidden: bool) -> None: if self._hidden_by_parent == hidden: @@ -201,6 +211,8 @@ class Group: for layer in self._layers: if isinstance(layer, (Group, TileGrid)): layer._set_hidden_by_parent(hidden) # pylint: disable=protected-access + elif isinstance(layer, _VectorShape): + layer._shape_set_dirty() # pylint: disable=protected-access @property def hidden(self) -> bool: @@ -233,12 +245,12 @@ class Group: if not isinstance(value, int) or value < 1: raise ValueError("Scale must be >= 1") if self._scale != value: - parent_scale = self._absolute_transform.scale / self._scale + parent_scale = self._absolute_transform.scale // self._scale self._absolute_transform.dx = ( - self._absolute_transform.dx / self._scale * value + self._absolute_transform.dx // self._scale * value ) self._absolute_transform.dy = ( - self._absolute_transform.dy / self._scale * value + self._absolute_transform.dy // self._scale * value ) self._absolute_transform.scale = parent_scale * value @@ -256,10 +268,10 @@ class Group: raise ValueError("x must be an integer") if self._group_x != value: if self._absolute_transform.transpose_xy: - dy_value = self._absolute_transform.dy / self._scale + dy_value = self._absolute_transform.dy // self._scale self._absolute_transform.y += dy_value * (value - self._group_x) else: - dx_value = self._absolute_transform.dx / self._scale + dx_value = self._absolute_transform.dx // self._scale self._absolute_transform.x += dx_value * (value - self._group_x) self._group_x = value self._update_child_transforms() @@ -275,10 +287,10 @@ class Group: raise ValueError("y must be an integer") if self._group_y != value: if self._absolute_transform.transpose_xy: - dx_value = self._absolute_transform.dx / self._scale + dx_value = self._absolute_transform.dx // self._scale self._absolute_transform.x += dx_value * (value - self._group_y) else: - dy_value = self._absolute_transform.dy / self._scale + dy_value = self._absolute_transform.dy // self._scale self._absolute_transform.y += dy_value * (value - self._group_y) self._group_y = value self._update_child_transforms()