jepler/Adafruit_CircuitPython_Display_Text
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed bounding box size calculations and logical flow for updating bitmap in _update_background_color

Browse source
This commit is contained in:
Margaret Matocha 2020-07-07 19:54:51 -05:00
parent 2d65dc0f5c
commit f106d483a1
1 changed files with 42 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
adafruit_display_text/label.py
View file

@ -112,11 +112,7 @@ class Label(displayio.Group):
self._background_color = background_color
self._background_palette = displayio.Palette(1)
self.append(
displayio.TileGrid(
displayio.Bitmap(1, 1, 1), pixel_shader=self._background_palette
)
) # initialize with a blank tilegrid placeholder for background
self._added_background_tilegrid = False
self._padding_top = padding_top
self._padding_bottom = padding_bottom
@ -160,7 +156,6 @@ class Label(displayio.Group):
)
y_box_offset = -ascender_max + y_offset - self._padding_top
self._update_background_color(self._background_color)
box_width = max(0, box_width) # remove any negative values
box_height = max(0, box_height) # remove any negative values
@ -171,21 +166,59 @@ class Label(displayio.Group):
x=left + x_box_offset,
y=y_box_offset,
)
return tile_grid
def _update_background_color(self, new_color):
if new_color is None:
self._background_palette.make_transparent(0)
if self._added_background_tilegrid:
self.pop(0)
self._added_background_tilegrid = False
else:
self._background_palette.make_opaque(0)
self._background_palette[0] = new_color
self._background_color = new_color
def _update_text(self, new_text): # pylint: disable=too-many-locals
y_offset = int(
(
self._font.get_glyph(ord("M")).height
- self.text.count("\n") * self.height * self.line_spacing
)
/ 2
)
lines = self.text.count("\n") + 1
if not self._added_background_tilegrid: # no bitmap is in the self Group
# add bitmap if text is present and bitmap sizes > 0 pixels
if ((len(self._text) > 0)
and (self._boundingbox[2] + self._padding_left + self._padding_right > 0)
and (self._boundingbox[3] + self._padding_top + self._padding_bottom > 0)):
if len(self) > 0:
self.insert(0, self._create_background_box(lines, y_offset))
else:
self.append(self._create_background_box(lines, y_offset))
self._added_background_tilegrid = True
else: # a bitmap is present in the self Group
# update bitmap if text is present and bitmap sizes > 0 pixels
if ((len(self._text) > 0)
and (self._boundingbox[2] + self._padding_left + self._padding_right > 0)
and (self._boundingbox[3] + self._padding_top + self._padding_bottom > 0)):
self[0] = self._create_background_box(lines, y_offset)
else: # delete the existing bitmap
self.pop(0)
self._added_background_tilegrid = False
def _update_text(
self, new_text
): # pylint: disable=too-many-locals ,too-many-branches, too-many-statements
x = 0
y = 0
i = 1
if self._added_background_tilegrid:
i = 1
else:
i = 0
old_c = 0
y_offset = int(
(
@ -267,7 +300,7 @@ class Label(displayio.Group):
self.pop()
self._text = new_text
self._boundingbox = (left, top, left + right, bottom - top)
self[0] = self._create_background_box(lines, y_offset)
self._update_background_color(self._background_color)
@property
def bounding_box(self):
@ -369,6 +402,5 @@ class Label(displayio.Group):
- (self._anchor_point[1] * self._boundingbox[3] * self._scale)
+ round((self._boundingbox[3] * self._scale) / 2.0)
)
self._boundingbox = (new_x, new_y, self._boundingbox[2], self._boundingbox[3])
self.x = new_x
self.y = new_y