X-Git-Url: https://git.ayoreis.com/hackapet/Adafruit_Blinka_Displayio.git/blobdiff_plain/a94203addedf0b7d4e5885848117b10bf6fa9fe1..4a87d0c44646f18d43d413a544977aabe73ab1d1:/fontio.py

diff --git a/fontio.py b/fontio.py
index 3a502af..2eddfa4 100644
--- a/fontio.py
+++ b/fontio.py
@@ -17,6 +17,7 @@ fontio for Blinka
 
 """
 
+import os
 from typing import Union, Tuple, Optional
 from PIL import ImageFont
 from displayio import Bitmap
@@ -29,6 +30,8 @@ except ImportError:
 __version__ = "0.0.0+auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
+DEFAULT_FONT = "displayio/resources/ter-u12n.pil"
+
 
 class FontProtocol(Protocol):
     """A protocol shared by `BuiltinFont` and classes in ``adafruit_bitmap_font``"""
@@ -52,7 +55,7 @@ class BuiltinFont:
     """Simulate a font built into CircuitPython"""
 
     def __init__(self):
-        self._font = ImageFont.load_default()
+        self._font = ImageFont.load(os.path.dirname(__file__) + "/" + DEFAULT_FONT)
         self._generate_bitmap(0x20, 0x7E)
 
     def _generate_bitmap(self, start_range, end_range):
@@ -75,7 +78,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."""
@@ -84,7 +87,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,