Skip to content

fix OnDiskBitmap pixel_shader #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 12, 2021
Merged

fix OnDiskBitmap pixel_shader #41

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbd558a
fix OnDiskBitmap pixel_shader
FoamyGuy Jul 10, 2021
b734d6c
run pre-commit
FoamyGuy Jul 10, 2021
460e5fc
add todo comment about changing pixel_shader when support for CP6 is …
FoamyGuy Jul 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion adafruit_displayio_layout/widgets/icon_widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,12 @@ 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())
# TODO: Once CP6 is no longer supported replace the above line with below.
# tile_grid = TileGrid(image, pixel_shader=image.pixel_shader)
)
else:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider adding the following comment after the tile_grid = ... line

            # TODO: Once CP6 is no longer supported replace the above line with below.
            # tile_grid = TileGrid(image, pixel_shader=image.pixel_shader)

image, palette = adafruit_imageload.load(icon)
tile_grid = TileGrid(image, pixel_shader=palette)
Expand Down