X-Git-Url: https://git.ayoreis.com/hackapet/Adafruit_Blinka_Displayio.git/blobdiff_plain/0517310e672707ee57c9cbc2ffab61252ca0fbff..a53c930973a24a7c55db9448e45d7ca7974cb56e:/fontio.py diff --git a/fontio.py b/fontio.py index d6a1ee2..a9200c9 100644 --- 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 + 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): -"""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. @@ -46,6 +47,7 @@ class FontProtocol(Protocol): If the code point is not present in the font, `None` is returned. """ + 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. """ - 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.""" @@ -82,7 +84,7 @@ class BuiltinFont: 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,