Merge branch 'main' into outlined_label

Author: FoamyGuy

README.rst

@@ -45,7 +45,7 @@ For a board with a built-in display.
     text_area = label.Label(terminalio.FONT, text=text)
     text_area.x = 10
     text_area.y = 10
-    board.DISPLAY.show(text_area)
+    board.DISPLAY.root_group = text_area
     while True:
         pass
 

adafruit_display_text/bitmap_label.py

@@ -27,9 +27,14 @@
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Display_Text.git"
 
 import displayio
-import bitmaptools
 from adafruit_display_text import LabelBase
 
+try:
+    import bitmaptools
+except ImportError:
+    # We have a slower fallback for bitmaptools
+    pass
+
 try:
     from typing import Optional, Tuple
     from fontio import FontProtocol
@@ -441,7 +446,7 @@ def _place_text(
 
                     self._blit(
                         bitmap,
-                        xposition + my_glyph.dx,
+                        max(xposition + my_glyph.dx, 0),
                         y_blit_target,
                         my_glyph.bitmap,
                         x_1=glyph_offset_x,

docs/conf.py

@@ -101,19 +101,10 @@
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-on_rtd = os.environ.get("READTHEDOCS", None) == "True"
-
-if not on_rtd:  # only import and set the theme if we're building docs locally
-    try:
-        import sphinx_rtd_theme
-
-        html_theme = "sphinx_rtd_theme"
-        html_theme_path = [sphinx_rtd_theme.get_html_theme_path(), "."]
-    except:
-        html_theme = "default"
-        html_theme_path = ["."]
-else:
-    html_theme_path = ["."]
+import sphinx_rtd_theme
+
+html_theme = "sphinx_rtd_theme"
+html_theme_path = [sphinx_rtd_theme.get_html_theme_path(), "."]
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,

docs/requirements.txt

@@ -2,5 +2,6 @@
 #
 # SPDX-License-Identifier: Unlicense
 
-sphinx>=4.0.0
+sphinx
 sphinxcontrib-jquery
+sphinx-rtd-theme