diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2019-03-19 16:22:09 -0700 |
|---|---|---|
| committer | Scott Shawcroft <scott@tannewt.org> | 2019-03-19 16:22:09 -0700 |
| commit | 5e2fec714cfbff8692d8af4ec8f774738b822ce1 (patch) | |
| tree | a9c38578948ae17b0cc090a8a14c962b1eef7cb4 /supervisor/shared | |
| parent | 8543695f9d6117d758d0cece4a921ce9396d3948 (diff) | |
Move Glyph and BuiltinFont into fontio
It was confusing in displayio.
Fixes #1662
Diffstat (limited to 'supervisor/shared')
| -rw-r--r-- | supervisor/shared/display.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/supervisor/shared/display.h b/supervisor/shared/display.h index cb321e85e..d5faa7777 100644 --- a/supervisor/shared/display.h +++ b/supervisor/shared/display.h @@ -27,9 +27,9 @@ #ifndef MICROPY_INCLUDED_SUPERVISOR_SHARED_DISPLAY_H #define MICROPY_INCLUDED_SUPERVISOR_SHARED_DISPLAY_H -#include "shared-bindings/displayio/BuiltinFont.h" #include "shared-bindings/displayio/Bitmap.h" #include "shared-bindings/displayio/TileGrid.h" +#include "shared-bindings/fontio/BuiltinFont.h" #include "shared-bindings/terminalio/Terminal.h" // These are autogenerated resources. @@ -37,7 +37,7 @@ // This is fixed so it doesn't need to be in RAM. extern const displayio_bitmap_t supervisor_terminal_font_bitmap; -extern const displayio_builtinfont_t supervisor_terminal_font; +extern const fontio_builtinfont_t supervisor_terminal_font; // These will change so they must live in RAM. extern displayio_tilegrid_t supervisor_terminal_text_grid; |