From: foamyguy Date: Tue, 15 Apr 2025 15:21:14 +0000 (-0500) Subject: Merge pull request #157 from bablokb/fix-vectorio X-Git-Tag: 2.1.8~1 X-Git-Url: https://git.ayoreis.com/hackapet/Adafruit_Blinka_Displayio.git/commitdiff_plain/c0c122e7b04612ccb0cdea6a11ae117aab727436?hp=e2be8f72346011c3c0e9001623623b043a8912ec Merge pull request #157 from bablokb/fix-vectorio Fix vectorio --- diff --git a/vectorio/_polygon.py b/vectorio/_polygon.py index 4e6e444..7f2af58 100644 --- a/vectorio/_polygon.py +++ b/vectorio/_polygon.py @@ -17,7 +17,7 @@ vectorio Polygon for Blinka """ -from typing import Union, Tuple +from typing import Union, Tuple, List from displayio._colorconverter import ColorConverter from displayio._palette import Palette from displayio._area import Area @@ -34,7 +34,7 @@ class Polygon(_VectorShape): self, *, pixel_shader: Union[ColorConverter, Palette], - points: list | Tuple[int, int], + points: List[Tuple[int, int]], x: int, y: int, ): @@ -54,12 +54,12 @@ class Polygon(_VectorShape): self.points = points @property - def points(self) -> list | Tuple[int, int]: + def points(self) -> List[Tuple[int, int]]: """The points of the polygon in pixels""" return self._points @points.setter - def points(self, value: list | Tuple[int, int]) -> None: + def points(self, value: List[Tuple[int, int]]) -> None: if len(value) < 3: raise ValueError("Polygon needs at least 3 points") self._points = value diff --git a/vectorio/_rectangle.py b/vectorio/_rectangle.py index e4c5952..15880c6 100644 --- a/vectorio/_rectangle.py +++ b/vectorio/_rectangle.py @@ -38,6 +38,7 @@ class Rectangle(_VectorShape): height: int, x: int, y: int, + color_index: int = 0, ): """Represents a rectangle by defining its bounds @@ -51,7 +52,7 @@ class Rectangle(_VectorShape): """ self._width = 1 self._height = 1 - self._color_index = 1 + self._color_index = color_index + 1 super().__init__(pixel_shader, x, y) self.width = width