From cbd558a99774d09953d01c113c3dfec45fefce2b Mon Sep 17 00:00:00 2001 From: foamyguy Date: Sat, 10 Jul 2021 11:41:50 -0500 Subject: [PATCH 1/3] fix OnDiskBitmap pixel_shader --- adafruit_displayio_layout/widgets/icon_widget.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_displayio_layout/widgets/icon_widget.py b/adafruit_displayio_layout/widgets/icon_widget.py index 8ce2816..bc8fbc9 100644 --- a/adafruit_displayio_layout/widgets/icon_widget.py +++ b/adafruit_displayio_layout/widgets/icon_widget.py @@ -59,7 +59,7 @@ def __init__(self, label_text, icon, on_disk=False, **kwargs): if on_disk: self._file = open(self._icon, "rb") image = OnDiskBitmap(self._file) - tile_grid = TileGrid(image, pixel_shader=ColorConverter()) + tile_grid = TileGrid(image, pixel_shader=getattr(image, 'pixel_shader', ColorConverter())) else: image, palette = adafruit_imageload.load(icon) tile_grid = TileGrid(image, pixel_shader=palette) From b734d6c5742b521bc0ee1a23ef03ddf0265c161f Mon Sep 17 00:00:00 2001 From: foamyguy Date: Sat, 10 Jul 2021 12:00:17 -0500 Subject: [PATCH 2/3] run pre-commit --- adafruit_displayio_layout/widgets/icon_widget.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/adafruit_displayio_layout/widgets/icon_widget.py b/adafruit_displayio_layout/widgets/icon_widget.py index bc8fbc9..2d6079c 100644 --- a/adafruit_displayio_layout/widgets/icon_widget.py +++ b/adafruit_displayio_layout/widgets/icon_widget.py @@ -59,7 +59,9 @@ def __init__(self, label_text, icon, on_disk=False, **kwargs): if on_disk: self._file = open(self._icon, "rb") image = OnDiskBitmap(self._file) - tile_grid = TileGrid(image, pixel_shader=getattr(image, 'pixel_shader', ColorConverter())) + tile_grid = TileGrid( + image, pixel_shader=getattr(image, "pixel_shader", ColorConverter()) + ) else: image, palette = adafruit_imageload.load(icon) tile_grid = TileGrid(image, pixel_shader=palette) From 460e5fc89d34e7de663c49dcc8596681fb185741 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Sat, 10 Jul 2021 12:36:01 -0500 Subject: [PATCH 3/3] add todo comment about changing pixel_shader when support for CP6 is dropped --- adafruit_displayio_layout/widgets/icon_widget.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adafruit_displayio_layout/widgets/icon_widget.py b/adafruit_displayio_layout/widgets/icon_widget.py index 2d6079c..e85abd1 100644 --- a/adafruit_displayio_layout/widgets/icon_widget.py +++ b/adafruit_displayio_layout/widgets/icon_widget.py @@ -60,7 +60,10 @@ def __init__(self, label_text, icon, on_disk=False, **kwargs): self._file = open(self._icon, "rb") image = OnDiskBitmap(self._file) tile_grid = TileGrid( - image, pixel_shader=getattr(image, "pixel_shader", ColorConverter()) + image, + pixel_shader=getattr(image, "pixel_shader", ColorConverter()) + # TODO: Once CP6 is no longer supported replace the above line with below. + # tile_grid = TileGrid(image, pixel_shader=image.pixel_shader) ) else: image, palette = adafruit_imageload.load(icon)