Merge pull request #112 from makermelissa/fix-docs

[hackapet/Adafruit_Blinka_Displayio.git] / fontio.py

diff --git a/fontio.py b/fontio.py
index 59ff0f9364ecf71c7502c7f6051f4eb71821bf90..a9200c9051e8775671c3983e9edd5eb4fa3a8f80 100644 (file)
--- a/fontio.py
+++ b/fontio.py
@@ -17,13 +17,37 @@ fontio for Blinka
 
 """
 
+from typing import Union, Tuple, Optional
 from PIL import ImageFont
 from displayio import Bitmap
 
-__version__ = "0.0.0-auto.0"
+try:
+    from typing import Protocol
+except ImportError:
+    from typing_extensions import Protocol
+
+__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``"""
+
+    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.
+
+        The four element version is ``(width, height, x_offset, y_offset)``.
+        The two element version is ``(width, height)``, in which
+        ``x_offset`` and ``y_offset`` are assumed to be zero.
+        """
+
+    def get_glyph(self, codepoint: int) -> Optional["Glyph"]:
+        """Retrieve the Glyph for a given code point
+
+        If the code point is not present in the font, `None` is returned.
+        """
+
+
 class BuiltinFont:
     """Simulate a font built into CircuitPython"""
 
@@ -51,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."""
@@ -60,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,