Fix scale bug in label.py, remove kwargs from both and add scale input parameter

Author: kmatch98

adafruit_display_text/bitmap_label.py

@@ -111,29 +111,19 @@ def __init__(
         anchor_point=None,
         anchored_position=None,
         save_text=True,  # can reduce memory use if save_text = False
-        **kwargs
+        scale=1,
     ):
 
-        # Scale will be passed to Group using kwargs.
-        if "scale" in kwargs.keys():
-            scale = kwargs["scale"]
-            kwargs.pop(
-                "scale"
-            )  # Do not change scale of self Group, use this value to set scale of local_group
-        else:
-            scale = 1  # Set default scale=1
-
         # instance the Group
         # self Group will contain a single local_group which contains one TileGrid which contains
         # the text bitmap
         super().__init__(
-            max_size=1, x=x, y=y, **kwargs
+            max_size=1, x=x, y=y, 
         )  # this will include any arguments, including scale
 
         self.local_group = displayio.Group(
-            max_size=1, **kwargs
-        )  # local_group holds the tileGrid and
-        # sets the scaling
+            max_size=1, scale=scale
+        )  # local_group holds the tileGrid and sets the scaling
         self.append(
             self.local_group
         )  # the local_group will always stay in the self Group
@@ -165,7 +155,6 @@ def __init__(
             anchored_position=anchored_position,
             save_text=save_text,
             scale=scale,
-            **kwargs,
         )
 
     def _reset_text(
@@ -184,7 +173,6 @@ def _reset_text(
         anchored_position=None,
         save_text=None,
         scale=None,
-        **kwargs
     ):
 
         # Store all the instance variables

adafruit_display_text/label.py

@@ -79,18 +79,16 @@ def __init__(
         padding_right=0,
         anchor_point=None,
         anchored_position=None,
-        **kwargs
+        scale=1,
     ):
-        if "scale" in kwargs.keys():
-            self._scale = kwargs["scale"]
-        else:
-            self._scale = 1
         if not max_glyphs and not text:
             raise RuntimeError("Please provide a max size, or initial text")
         if not max_glyphs:
             max_glyphs = len(text)
         # add one to max_size for the background bitmap tileGrid
-        super().__init__(max_size=max_glyphs + 1, **kwargs)
+        super().__init__(max_size=1)
+        self.local_group=displayio.Group(max_size=max_glyphs + 1, scale=scale)
+        self.append(self.local_group)
 
         self.width = max_glyphs
         self._font = font
@@ -121,12 +119,15 @@ def __init__(
         self._padding_bottom = padding_bottom
         self._padding_left = padding_left
         self._padding_right = padding_right
+        
+        self._scale=scale
 
         if text is not None:
             self._update_text(str(text))
         if (anchored_position is not None) and (anchor_point is not None):
             self.anchored_position = anchored_position
 
+
     def _create_background_box(self, lines, y_offset):
 
         left = self._boundingbox[0]
@@ -172,14 +173,16 @@ def _create_background_box(self, lines, y_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.local_group.pop(0)
                 self._added_background_tilegrid = False
         else:
             self._background_palette.make_opaque(0)
@@ -200,10 +203,10 @@ def _update_background_color(self, new_color):
                     self._boundingbox[3] + self._padding_top + self._padding_bottom > 0
                 )
             ):
-                if len(self) > 0:
-                    self.insert(0, self._create_background_box(lines, y_offset))
+                if len(self.local_group) > 0: # This can be simplified in CP v6.0, when group.append(0) bug is corrected
+                    self.local_group.insert(0, self._create_background_box(lines, y_offset))
                 else:
-                    self.append(self._create_background_box(lines, y_offset))
+                    self.local_group.append(self._create_background_box(lines, y_offset))
                 self._added_background_tilegrid = True
 
         else:  # a bitmap is present in the self Group
@@ -217,9 +220,9 @@ def _update_background_color(self, new_color):
                     self._boundingbox[3] + self._padding_top + self._padding_bottom > 0
                 )
             ):
-                self[0] = self._create_background_box(lines, y_offset)
+                self.local_group[0] = self._create_background_box(lines, y_offset)
             else:  # delete the existing bitmap
-                self.pop(0)
+                self.local_group.pop(0)
                 self._added_background_tilegrid = False
 
     def _update_text(
@@ -284,10 +287,10 @@ def _update_text(
                         x=position_x,
                         y=position_y,
                     )
-                if tilegrid_count < len(self):
-                    self[tilegrid_count] = face
+                if tilegrid_count < len(self.local_group):
+                    self.local_group[tilegrid_count] = face
                 else:
-                    self.append(face)
+                    self.local_group.append(face)
                 tilegrid_count += 1
             x += glyph.shift_x
             i += 1
@@ -296,8 +299,8 @@ def _update_text(
         if left is None:
             left = 0
 
-        while len(self) > tilegrid_count:  # i:
-            self.pop()
+        while len(self.local_group) > tilegrid_count:  # i:
+            self.local_group.pop()
         self._text = new_text
         self._boundingbox = (left, top, right - left, bottom - top)
 
@@ -319,6 +322,7 @@ def line_spacing(self):
     @line_spacing.setter
     def line_spacing(self, spacing):
         self._line_spacing = spacing
+        self.text=self._text # redraw the box
 
     @property
     def color(self):
@@ -358,6 +362,19 @@ def text(self, new_text):
         except RuntimeError as run_error:
             raise RuntimeError("Text length exceeds max_glyphs") from run_error
 
+    @property
+    def scale(self):
+        return self._scale
+
+    @scale.setter
+    def scale(self, new_scale):
+        current_anchored_position=self.anchored_position
+        self._scale=new_scale
+        self.local_group.scale=new_scale
+        self.anchored_position=current_anchored_position
+
+    
+
     @property
     def font(self):
         """Font to use for text display."""