Merge remote-tracking branch 'upstream/master'

Author: Margaret Matocha

adafruit_display_text/label.py

@@ -169,10 +169,10 @@ def _update_text(self, new_text):  # pylint: disable=too-many-locals
 
             x += glyph.shift_x
 
-            # TODO skip this for control sequences or non-qables.
+            # TODO skip this for control sequences or non-printables.
             i += 1
             old_c += 1
-            # skip all non-prinables in the old string
+            # skip all non-printables in the old string
             while (
                 self._text
                 and old_c < len(self._text)
@@ -238,7 +238,9 @@ def text(self):
 
     @text.setter
     def text(self, new_text):
+        current_anchored_position = self.anchored_position
         self._update_text(str(new_text))
+        self.anchored_position = current_anchored_position
 
     @property
     def font(self):
@@ -248,11 +250,13 @@ def font(self):
     @font.setter
     def font(self, new_font):
         old_text = self._text
+        current_anchored_position = self.anchored_position
         self._text = ""
         self._font = new_font
         bounds = self._font.get_bounding_box()
         self.height = bounds[1]
         self._update_text(str(old_text))
+        self.anchored_position = current_anchored_position
 
     @property
     def anchor_point(self):
@@ -263,18 +267,36 @@ def anchor_point(self):
 
     @anchor_point.setter
     def anchor_point(self, new_anchor_point):
+        current_anchored_position = self.anchored_position
         self._anchor_point = new_anchor_point
+        self.anchored_position = current_anchored_position
 
     @property
     def anchored_position(self):
         """Position relative to the anchor_point. Tuple containing x,y
            pixel coordinates."""
         return (
-            self.x - self._boundingbox[2] * self._anchor_point[0],
-            self.y - self._boundingbox[3] * self._anchor_point[1],
+            int(
+                self.x
+                + self._boundingbox[0]
+                + self._anchor_point[0] * self._boundingbox[2]
+            ),
+            int(
+                self.y
+                + self._boundingbox[1]
+                + self._anchor_point[1] * self._boundingbox[3]
+            ),
         )
 
     @anchored_position.setter
     def anchored_position(self, new_position):
-        self.x = int(new_position[0] - (self._boundingbox[2] * self._anchor_point[0]))
-        self.y = int(new_position[1] - (self._boundingbox[3] * self._anchor_point[1]))
+        self.x = int(
+            new_position[0]
+            - self._boundingbox[0]
+            - self._anchor_point[0] * self._boundingbox[2]
+        )
+        self.y = int(
+            new_position[1]
+            - self._boundingbox[1]
+            - self._anchor_point[1] * self._boundingbox[3]
+        )

examples/display_text_anchored_position.py

@@ -12,39 +12,39 @@
 
 text_area_top_left = label.Label(terminalio.FONT, text=TEXT)
 text_area_top_left.anchor_point = (0.0, 0.0)
-text_area_top_left.anchored_position = (10, 10)
+text_area_top_left.anchored_position = (0, 0)
 
 text_area_top_middle = label.Label(terminalio.FONT, text=TEXT)
 text_area_top_middle.anchor_point = (0.5, 0.0)
-text_area_top_middle.anchored_position = (DISPLAY_WIDTH / 2, 10)
+text_area_top_middle.anchored_position = (DISPLAY_WIDTH / 2, 0)
 
 text_area_top_right = label.Label(terminalio.FONT, text=TEXT)
 text_area_top_right.anchor_point = (1.0, 0.0)
-text_area_top_right.anchored_position = (DISPLAY_WIDTH - 10, 10)
+text_area_top_right.anchored_position = (DISPLAY_WIDTH, 0)
 
 text_area_middle_left = label.Label(terminalio.FONT, text=TEXT)
 text_area_middle_left.anchor_point = (0.0, 0.5)
-text_area_middle_left.anchored_position = (10, DISPLAY_HEIGHT / 2)
+text_area_middle_left.anchored_position = (0, DISPLAY_HEIGHT / 2)
 
 text_area_middle_middle = label.Label(terminalio.FONT, text=TEXT)
 text_area_middle_middle.anchor_point = (0.5, 0.5)
 text_area_middle_middle.anchored_position = (DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2)
 
 text_area_middle_right = label.Label(terminalio.FONT, text=TEXT)
 text_area_middle_right.anchor_point = (1.0, 0.5)
-text_area_middle_right.anchored_position = (DISPLAY_WIDTH - 10, DISPLAY_HEIGHT / 2)
+text_area_middle_right.anchored_position = (DISPLAY_WIDTH, DISPLAY_HEIGHT / 2)
 
 text_area_bottom_left = label.Label(terminalio.FONT, text=TEXT)
 text_area_bottom_left.anchor_point = (0.0, 1.0)
-text_area_bottom_left.anchored_position = (10, DISPLAY_HEIGHT)
+text_area_bottom_left.anchored_position = (0, DISPLAY_HEIGHT)
 
 text_area_bottom_middle = label.Label(terminalio.FONT, text=TEXT)
 text_area_bottom_middle.anchor_point = (0.5, 1.0)
 text_area_bottom_middle.anchored_position = (DISPLAY_WIDTH / 2, DISPLAY_HEIGHT)
 
 text_area_bottom_right = label.Label(terminalio.FONT, text=TEXT)
 text_area_bottom_right.anchor_point = (1.0, 1.0)
-text_area_bottom_right.anchored_position = (DISPLAY_WIDTH - 10, DISPLAY_HEIGHT)
+text_area_bottom_right.anchored_position = (DISPLAY_WIDTH, DISPLAY_HEIGHT)
 
 text_group = displayio.Group(max_size=9)
 text_group.append(text_area_top_middle)