Skip to content

Allow different fonts for multiple labels #30

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 2 commits into from
Oct 23, 2020
Merged

Allow different fonts for multiple labels #30

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13fc5f9
Allow different fonts for multiple labels
makermelissa Oct 23, 2020
6338bfa
Force use of the font
makermelissa Oct 23, 2020
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
39 changes: 22 additions & 17 deletions adafruit_matrixportal/matrixportal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ def __init__(
self._text_scrolling = []
self._text_scale = []
self._scrolling_index = None
self._text_font = terminalio.FONT
self._text_font = []
self._text_line_spacing = []

gc.collect()
Expand All @@ -135,7 +135,7 @@ def __init__(
def add_text(
self,
text_position=None,
text_font=None,
text_font=terminalio.FONT,
text_color=0x808080,
text_wrap=False,
text_maxlen=0,
Expand Down Expand Up @@ -163,11 +163,10 @@ def add_text(
the scrolling set to True will be cycled through.

"""
if text_font:
if text_font is terminalio.FONT:
self._text_font = text_font
else:
self._text_font = bitmap_font.load_font(text_font)
if text_font is terminalio.FONT:
self._text_font.append(text_font)
else:
self._text_font.append(bitmap_font.load_font(text_font))
if not text_wrap:
text_wrap = 0
if not text_maxlen:
Expand Down Expand Up @@ -228,7 +227,7 @@ def set_background(self, file_or_color, position=None):
"""
self.graphics.set_background(file_or_color, position)

def preload_font(self, glyphs=None):
def preload_font(self, glyphs=None, index=0):
# pylint: disable=line-too-long
"""Preload font.

Expand All @@ -239,8 +238,8 @@ def preload_font(self, glyphs=None):
if not glyphs:
glyphs = b"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-!,. \"'?!"
print("Preloading font glyphs:", glyphs)
if self._text_font is not terminalio.FONT:
self._text_font.load_glyphs(glyphs)
if self._text_font[index] is not terminalio.FONT:
self._text_font[index].load_glyphs(glyphs)

def set_text_color(self, color, index=0):
"""Update the text color, with indexing into our list of text boxes.
Expand Down Expand Up @@ -279,7 +278,7 @@ def set_text(self, val, index=0):

if len(string) > 0:
self._text[index] = Label(
self._text_font, text=string, scale=self._text_scale[index]
self._text_font[index], text=string, scale=self._text_scale[index]
)
self._text[index].color = self._text_color[index]
self._text[index].x = self._text_position[index][0]
Expand Down Expand Up @@ -373,12 +372,18 @@ def scroll_text(self, frame_delay=0.02):
"""
if self._scrolling_index is None: # Not initialized yet
return

self._text[self._scrolling_index].x = self.graphics.display.width
line_width = self._text[self._scrolling_index].bounding_box[2]
for _ in range(self.graphics.display.width + line_width + 1):
self.scroll()
sleep(frame_delay)
if self._text[self._scrolling_index] is not None:
self._text[self._scrolling_index].x = self.graphics.display.width
line_width = self._text[self._scrolling_index].bounding_box[2]
for _ in range(self.graphics.display.width + line_width + 1):
self.scroll()
sleep(frame_delay)
else:
raise RuntimeError(
"Please assign text to the label with index {} before scrolling".format(
self._scrolling_index
)
)

def fetch(self, refresh_url=None, timeout=10):
"""Fetch data from the url we initialized with, perfom any parsing,
Expand Down