Skip to content

Pass filename to OnDiskBitmap to avoid closed file problem #54

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 1 commit into from
Nov 24, 2021
Merged

Pass filename to OnDiskBitmap to avoid closed file problem #54

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 3 additions & 9 deletions adafruit_displayio_layout/widgets/icon_widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@


import terminalio
from displayio import TileGrid, OnDiskBitmap, ColorConverter
from displayio import TileGrid, OnDiskBitmap
import adafruit_imageload
from adafruit_display_text import bitmap_label
from adafruit_displayio_layout.widgets.control import Control
Expand Down Expand Up @@ -57,14 +57,8 @@ def __init__(self, label_text, icon, on_disk=False, **kwargs):
self._icon = icon

if on_disk:
with open(self._icon, "rb") as self._file:
image = OnDiskBitmap(self._file)
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)
)
image = OnDiskBitmap(self._icon)
tile_grid = TileGrid(image, pixel_shader=image.pixel_shader)
else:
image, palette = adafruit_imageload.load(icon)
tile_grid = TileGrid(image, pixel_shader=palette)
Expand Down