From f7b762c955f00ccfadb3f22292ba6a4ca57ac048 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Wed, 10 Mar 2021 06:36:45 -0600 Subject: [PATCH 1/2] break out set_background_color for the different types of labels --- adafruit_display_text/__init__.py | 12 +++++------- adafruit_display_text/bitmap_label.py | 9 +++++++++ adafruit_display_text/label.py | 3 +++ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/adafruit_display_text/__init__.py b/adafruit_display_text/__init__.py index acdb2e5..c0ce501 100644 --- a/adafruit_display_text/__init__.py +++ b/adafruit_display_text/__init__.py @@ -279,15 +279,13 @@ def background_color(self): """Color of the background as an RGB hex number.""" return self._background_color + def _set_background_color(self, new_color): + # subclasses should override this + pass + @background_color.setter def background_color(self, new_color): - self._background_color = new_color - if new_color is not None: - self.palette[0] = new_color - self.palette.make_opaque(0) - else: - self.palette[0] = 0 - self.palette.make_transparent(0) + self._set_background_color(new_color) @property def anchor_point(self): diff --git a/adafruit_display_text/bitmap_label.py b/adafruit_display_text/bitmap_label.py index 027a691..9d9f072 100755 --- a/adafruit_display_text/bitmap_label.py +++ b/adafruit_display_text/bitmap_label.py @@ -554,3 +554,12 @@ def _set_font(self, new_font): def _set_text(self, new_text, scale): new_text = self._tab_text.join(new_text.split("\t")) self._reset_text(text=new_text, scale=self.scale) + + def _set_background_color(self, new_color): + self._background_color = new_color + if new_color is not None: + self.palette[0] = new_color + self.palette.make_opaque(0) + else: + self.palette[0] = 0 + self.palette.make_transparent(0) diff --git a/adafruit_display_text/label.py b/adafruit_display_text/label.py index b93b969..dd8fdf4 100755 --- a/adafruit_display_text/label.py +++ b/adafruit_display_text/label.py @@ -329,3 +329,6 @@ def _set_line_spacing(self, new_line_spacing): def _set_text(self, new_text, scale): self._reset_text(new_text) + + def _set_background_color(self, new_color): + self._update_background_color(new_color) \ No newline at end of file From b62b2cf93a7165f8dd7c6fd264976026e01e898d Mon Sep 17 00:00:00 2001 From: foamyguy Date: Wed, 10 Mar 2021 06:41:23 -0600 Subject: [PATCH 2/2] black code format --- adafruit_display_text/label.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_display_text/label.py b/adafruit_display_text/label.py index dd8fdf4..dadc7f0 100755 --- a/adafruit_display_text/label.py +++ b/adafruit_display_text/label.py @@ -331,4 +331,4 @@ def _set_text(self, new_text, scale): self._reset_text(new_text) def _set_background_color(self, new_color): - self._update_background_color(new_color) \ No newline at end of file + self._update_background_color(new_color)