From 19fba30ce78717b6897cf50ce40c52217b580df3 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Tue, 27 May 2025 15:51:36 -0500 Subject: [PATCH 1/3] fix anchored positioning for TextBox, update example to use it. --- adafruit_display_text/text_box.py | 8 +++----- examples/display_text_text_box_simpletest.py | 13 +++++++------ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/adafruit_display_text/text_box.py b/adafruit_display_text/text_box.py index 50607bf..83b89cb 100644 --- a/adafruit_display_text/text_box.py +++ b/adafruit_display_text/text_box.py @@ -264,7 +264,7 @@ def _reset_text( # Calculate both "tight" and "loose" bounding box dimensions to match label for # anchor_position calculations ( - box_x, + box_x, # noqa: F841, var assigned not used tight_box_y, x_offset, tight_y_offset, @@ -288,8 +288,6 @@ def _reset_text( y_offset = loose_y_offset # Calculate the background size including padding - tight_box_x = box_x - box_x = box_x + self._padding_left + self._padding_right box_y = box_y + self._padding_top + self._padding_bottom if self.dynamic_height: @@ -343,8 +341,8 @@ def _reset_text( self._bounding_box = ( self._tilegrid.x + self._padding_left, self._tilegrid.y + self._padding_top, - tight_box_x, - tight_box_y, + self.width, + self.height, ) if ( diff --git a/examples/display_text_text_box_simpletest.py b/examples/display_text_text_box_simpletest.py index 42c4774..0aeb9d0 100644 --- a/examples/display_text_text_box_simpletest.py +++ b/examples/display_text_text_box_simpletest.py @@ -7,6 +7,7 @@ from adafruit_display_text.text_box import TextBox +display = board.DISPLAY main_group = displayio.Group() left_text = ("Left left left left " * 2).rstrip() @@ -21,8 +22,8 @@ scale=1, ) -left_text_area.x = 10 -left_text_area.y = 10 +left_text_area.anchor_point = (0, 0) +left_text_area.anchored_position = (0, 0) main_group.append(left_text_area) @@ -38,8 +39,8 @@ scale=1, ) -center_text_area.x = 10 -center_text_area.y = 10 + left_text_area.height + 10 +center_text_area.anchor_point = (0.5, 0.5) +center_text_area.anchored_position = (display.width // 2, display.height // 2) main_group.append(center_text_area) @@ -55,8 +56,8 @@ scale=1, ) -right_text_area.x = 10 -right_text_area.y = center_text_area.y + center_text_area.height + 10 +right_text_area.anchor_point = (1.0, 1.0) +right_text_area.anchored_position = (display.width, display.height) main_group.append(right_text_area) board.DISPLAY.root_group = main_group From 406fc220ec25e531417840ce2bad0dce5ca0be78 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Sat, 31 May 2025 10:47:14 -0500 Subject: [PATCH 2/3] displayio api updates --- examples/display_text_background_color_padding.py | 3 ++- examples/display_text_label_vs_bitmap_label_comparison.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/display_text_background_color_padding.py b/examples/display_text_background_color_padding.py index 5c4fc9a..f0913b6 100755 --- a/examples/display_text_background_color_padding.py +++ b/examples/display_text_background_color_padding.py @@ -9,6 +9,7 @@ import board import displayio +import fourwire from adafruit_bitmap_font import bitmap_font from adafruit_display_text import label @@ -42,7 +43,7 @@ spi.configure(baudrate=32000000) spi.unlock() - display_bus = displayio.FourWire( + display_bus = fourwire.FourWire( spi, command=tft_dc, chip_select=tft_cs, diff --git a/examples/display_text_label_vs_bitmap_label_comparison.py b/examples/display_text_label_vs_bitmap_label_comparison.py index fcb951f..6adef24 100644 --- a/examples/display_text_label_vs_bitmap_label_comparison.py +++ b/examples/display_text_label_vs_bitmap_label_comparison.py @@ -7,6 +7,7 @@ import board import displayio +import fourwire import terminalio from adafruit_bitmap_font import bitmap_font @@ -59,7 +60,7 @@ spi.configure(baudrate=32000000) spi.unlock() - display_bus = displayio.FourWire( + display_bus = fourwire.FourWire( spi, command=tft_dc, chip_select=tft_cs, From 7d1f187aac8e899e791324cc78633bf4f32c984b Mon Sep 17 00:00:00 2001 From: foamyguy Date: Wed, 4 Jun 2025 10:00:20 -0500 Subject: [PATCH 3/3] update rtd.yml file Signed-off-by: foamyguy --- .readthedocs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 88bca9f..255dafd 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -12,7 +12,7 @@ sphinx: configuration: docs/conf.py build: - os: ubuntu-20.04 + os: ubuntu-lts-latest tools: python: "3"