More bug fixes

[hackapet/Adafruit_Blinka_Displayio.git] / fontio.py

diff --git a/fontio.py b/fontio.py
index d6a1ee222c84221b142a24839e0f51f192495807..a9200c9051e8775671c3983e9edd5eb4fa3a8f80 100644 (file)
--- a/fontio.py
+++ b/fontio.py
@@ -20,17 +20,18 @@ fontio for Blinka
 from typing import Union, Tuple, Optional
 from PIL import ImageFont
 from displayio import Bitmap
 from typing import Union, Tuple, Optional
 from PIL import ImageFont
 from displayio import Bitmap

+

 try:
     from typing import Protocol
 except ImportError:
     from typing_extensions import Protocol
 
 try:
     from typing import Protocol
 except ImportError:
     from typing_extensions import Protocol
 

-__version__ = "0.0.0-auto.0"
+__version__ = "0.0.0+auto.0"

 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 
 class FontProtocol(Protocol):
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 
 class FontProtocol(Protocol):

-"""A protocol shared by `BuiltinFont` and classes in ``adafruit_bitmap_font``"""
+    """A protocol shared by `BuiltinFont` and classes in ``adafruit_bitmap_font``"""

 
     def get_bounding_box(self) -> Union[Tuple[int, int], Tuple[int, int, int, int]]:
         """Retrieve the maximum bounding box of any glyph in the font.
 
     def get_bounding_box(self) -> Union[Tuple[int, int], Tuple[int, int, int, int]]:
         """Retrieve the maximum bounding box of any glyph in the font.


@@ -46,6 +47,7 @@ class FontProtocol(Protocol):
         If the code point is not present in the font, `None` is returned.
         """
 
         If the code point is not present in the font, `None` is returned.
         """
 

+

 class BuiltinFont:
     """Simulate a font built into CircuitPython"""
 
 class BuiltinFont:
     """Simulate a font built into CircuitPython"""
 


@@ -73,7 +75,7 @@ class BuiltinFont:
         """Returns the maximum bounds of all glyphs in the font in
         a tuple of two values: width, height.
         """
         """Returns the maximum bounds of all glyphs in the font in
         a tuple of two values: width, height.
         """

-        return self._font.getsize("M")
+        return self._font.getbbox("M")[2:4]

 
     def get_glyph(self, codepoint):
         """Returns a `fontio.Glyph` for the given codepoint or None if no glyph is available."""
 
     def get_glyph(self, codepoint):
         """Returns a `fontio.Glyph` for the given codepoint or None if no glyph is available."""


@@ -82,7 +84,7 @@ class BuiltinFont:
         else:
             return None
 
         else:
             return None
 

-        bounding_box = self._font.getsize(chr(codepoint))
+        bounding_box = self._font.getbbox(chr(codepoint))[2:4]

         width, height = bounding_box
         return Glyph(
             bitmap=self._bitmap,
         width, height = bounding_box
         return Glyph(
             bitmap=self._bitmap,