Skip to content

Commit 87272aa

Browse files
committed
Merge remote-tracking branch 'Adafruit/master' into directional_label
# Conflicts: # adafruit_display_text/__init__.py
2 parents f6d19be + 5934db7 commit 87272aa

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

adafruit_display_text/__init__.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -297,15 +297,13 @@ def background_color(self) -> int:
297297
"""Color of the background as an RGB hex number."""
298298
return self._background_color
299299

300+
def _set_background_color(self, new_color: int) -> None:
301+
# subclasses should override this
302+
pass
303+
300304
@background_color.setter
301-
def background_color(self, new_color: int) -> None:
302-
self._background_color = new_color
303-
if new_color is not None:
304-
self.palette[0] = new_color
305-
self.palette.make_opaque(0)
306-
else:
307-
self.palette[0] = 0
308-
self.palette.make_transparent(0)
305+
def background_color(self, new_color: int):
306+
self._set_background_color(new_color)
309307

310308
@property
311309
def anchor_point(self) -> Tuple[float, float]:

adafruit_display_text/bitmap_label.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,3 +559,12 @@ def _set_font(self, new_font) -> None:
559559
def _set_text(self, new_text: str, scale: int) -> None:
560560
new_text = self._tab_text.join(new_text.split("\t"))
561561
self._reset_text(text=new_text, scale=self.scale)
562+
563+
def _set_background_color(self, new_color):
564+
self._background_color = new_color
565+
if new_color is not None:
566+
self.palette[0] = new_color
567+
self.palette.make_opaque(0)
568+
else:
569+
self.palette[0] = 0
570+
self.palette.make_transparent(0)

adafruit_display_text/label.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,3 +332,6 @@ def _set_line_spacing(self, new_line_spacing):
332332

333333
def _set_text(self, new_text, scale):
334334
self._reset_text(new_text)
335+
336+
def _set_background_color(self, new_color):
337+
self._update_background_color(new_color)

0 commit comments

Comments
 (0)