Skip to content

Update scale to remove self._scale that conflicts with Blinka #117

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
Feb 11, 2021
Merged

Update scale to remove self._scale that conflicts with Blinka #117

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
9 changes: 4 additions & 5 deletions adafruit_display_text/bitmap_label.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,12 +563,11 @@ def bounding_box(self):
@property
def scale(self):
"""Set the scaling of the label, in integer values"""
return self._scale
return self.local_group.scale

@scale.setter
def scale(self, new_scale):
self.local_group.scale = new_scale
self._scale = new_scale
self.anchored_position = self._anchored_position # update the anchored_position

@property
Expand All @@ -580,7 +579,7 @@ def line_spacing(self):
@line_spacing.setter
def line_spacing(self, new_line_spacing):
if self._save_text:
self._reset_text(line_spacing=new_line_spacing)
self._reset_text(line_spacing=new_line_spacing, scale=self.scale)
else:
raise RuntimeError("line_spacing is immutable when save_text is False")

Expand Down Expand Up @@ -621,7 +620,7 @@ def text(self):

@text.setter # Cannot set color or background color with text setter, use separate setter
def text(self, new_text):
self._reset_text(text=new_text)
self._reset_text(text=new_text, scale=self.scale)

@property
def font(self):
Expand All @@ -632,7 +631,7 @@ def font(self):
def font(self, new_font):
self._font = new_font
if self._save_text:
self._reset_text(font=new_font)
self._reset_text(font=new_font, scale=self.scale)
else:
raise RuntimeError("font is immutable when save_text is False")

Expand Down