From 93525a422fa99b8d1fc63b4526822fc4bc85476c Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Thu, 14 Sep 2023 18:36:19 +0100
Subject: [PATCH] Bitmap Fonts: Fixed-width space for #765.

---
 libraries/bitmap_fonts/bitmap_fonts.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libraries/bitmap_fonts/bitmap_fonts.cpp b/libraries/bitmap_fonts/bitmap_fonts.cpp
index c06e856a5..0eb1cc6f0 100644
--- a/libraries/bitmap_fonts/bitmap_fonts.cpp
+++ b/libraries/bitmap_fonts/bitmap_fonts.cpp
@@ -152,6 +152,9 @@ namespace bitmap {
     uint32_t line_offset = 0; // line (if wrapping) offset
     unicode_sorta::codepage_t codepage = unicode_sorta::PAGE_195;
 
+    int32_t space_width = measure_character(font, ' ', scale, codepage, fixed_width);
+    space_width += letter_spacing * scale;
+
     size_t i = 0;
     while(i < t.length()) {
       // find length of current word
@@ -201,7 +204,7 @@ namespace bitmap {
           line_offset += (font->height + 1) * scale;
           char_offset = 0;
         } else if (t[j] == ' ') { // Space
-          char_offset += font->widths[0] * scale;
+          char_offset += space_width;
         } else {
           switch(rotation) {
             case 0: