From b12051a25aec379c3e3c58c0883b28d5098140a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Boh=C3=A1=C4=8Dek?=
 <fandabohacek@gmail.com>
Date: Mon, 28 Jun 2021 18:47:42 +0200
Subject: [PATCH] fix: font measure

---
 lib-gui/src/font.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib-gui/src/font.c b/lib-gui/src/font.c
index e02e6ffdd27289339cdb9b33b8b3c8be14f4a4f3..e3c204366d797a1f68a97601a03bfd767fb5392c 100644
--- a/lib-gui/src/font.c
+++ b/lib-gui/src/font.c
@@ -108,7 +108,7 @@ font_t font_family_create(font_descriptor_t def, font_family_t *family) {
 size2d_t font_measure_text(font_t *font, char *text) {
   size2d_t size = {.x = 0, .y = font->size};
 
-  double scale = (double)font->size / font->font.height;
+  double scale = (double)font->size / font_family_get_descriptor(font)->height;
   size_t len = strlen(text);
   for (int i = 0; i < len && *text != '\0'; i++) {
     uint16_t bytes;
@@ -116,7 +116,7 @@ size2d_t font_measure_text(font_t *font, char *text) {
     text += bytes;
 
     font_character_t character = font_get_character(font, c);
-    size.x += character.width * scale;
+    size.x += character.width * scale + font->char_spacing;
   }
 
   return size;