Skip to content

fix size of non-outlined labels #234

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

Open
FoamyGuy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix size of non-outlined labels #234

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
31 changes: 19 additions & 12 deletions adafruit_display_text/bitmap_label.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,14 +147,15 @@ def __init__(
self._tilegrid = None
self._prev_label_direction = None

if "padding_top" not in kwargs:
kwargs["padding_top"] = outline_size + 0
if "padding_bottom" not in kwargs:
kwargs["padding_bottom"] = outline_size + 2
if "padding_left" not in kwargs:
kwargs["padding_left"] = outline_size + 0
if "padding_right" not in kwargs:
kwargs["padding_right"] = outline_size + 0
if outline_color is not None:
if "padding_top" not in kwargs:
kwargs["padding_top"] = outline_size
if "padding_bottom" not in kwargs:
kwargs["padding_bottom"] = outline_size
if "padding_left" not in kwargs:
kwargs["padding_left"] = outline_size
if "padding_right" not in kwargs:
kwargs["padding_right"] = outline_size

super().__init__(font, **kwargs)

Expand Down Expand Up @@ -930,10 +931,10 @@ def outline_size(self):
def outline_size(self, new_outline_size):
self._outline_size = new_outline_size

self._padding_top = new_outline_size + 0
self._padding_bottom = new_outline_size + 2
self._padding_left = new_outline_size + 0
self._padding_right = new_outline_size + 0
self._padding_bottom = max(self._padding_bottom, self.outline_size)
self._padding_top = max(self._padding_top, self.outline_size)
self._padding_left = max(self._padding_left, self.outline_size)
self._padding_right = max(self._padding_right, self.outline_size)

self._init_outline_stamp(new_outline_size)
self._reset_text(
Expand All @@ -960,6 +961,12 @@ def add_accent_range(
"""
if accent_type not in {"foreground_background", "outline"}:
raise ValueError("accent_type must be either 'foreground_background' or 'outline'")

if accent_type == "outline":
self._padding_bottom = max(self._padding_bottom, self.outline_size)
self._padding_top = max(self._padding_top, self.outline_size)
self._padding_left = max(self._padding_left, self.outline_size)
self._padding_right = max(self._padding_right, self.outline_size)
self._accent_ranges.append((start, end, foreground_color, background_color, accent_type))
self._reset_text(text=str(self._text))

Expand Down