Merge pull request #157 from bablokb/fix-vectorio

Fix vectorio

diff --git a/vectorio/_polygon.py b/vectorio/_polygon.py
index 4e6e4449818b8e83536b4ae92ee266650c0beeff..7f2af587465c47b20b7352ad1880a3f54d15934d 100644 (file)
--- 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 e4c595272ad921a577e3ee557c3d8d81e162066f..15880c659c6b6c083c31818d5c77e56367454e85 100644 (file)
--- 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