Fixed bug #299 - Bitmap font spacing incorrect when using Harfbuzz

libsdl-org · Aug 1, 2023 · 7217e27 · 7217e27
1 parent fee14e5
commit 7217e27
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/SDL_ttf.c b/src/SDL_ttf.c
@@ -3153,6 +3153,7 @@ static int TTF_Size_Internal(TTF_Font *font,
     hb_glyph_info_t *hb_glyph_info;
     hb_glyph_position_t *hb_glyph_position;
     int y = 0;
+    int advance_if_bold = 0;
 #else
     size_t textlen;
     int skip_first = 1;
@@ -3195,6 +3196,12 @@ static int TTF_Size_Internal(TTF_Font *font,
     font->pos_len = 0;
 
 #if TTF_USE_HARFBUZZ
+
+    /* Adjust for bold text */
+    if (TTF_HANDLE_STYLE_BOLD(font)) {
+        advance_if_bold = F26Dot6(font->glyph_overhang);
+    }
+
     /* Create a buffer for harfbuzz to use */
     hb_buffer = hb_buffer_create();
     if (hb_buffer == NULL) {
@@ -3269,7 +3276,7 @@ static int TTF_Size_Internal(TTF_Font *font,
         /* Compute positions */
         pos_x  = x                     + x_offset;
         pos_y  = y + F26Dot6(font->ascent) - y_offset;
-        x     += x_advance;
+        x     += x_advance + advance_if_bold;
         y     += y_advance;
 #else
         /* Compute positions */