From 9927565aeaea78788085a3738ed9dcfb95bdd603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaakko=20Kera=CC=88nen?= <jaakko.keranen@iki.fi>
Date: Tue, 12 Jan 2021 10:40:35 +0200
Subject: [PATCH 1/1] Text: Augment previous cherry-pick

---
 src/ui/text.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/ui/text.c b/src/ui/text.c
index b36dd448..ac2766a3 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -83,9 +83,11 @@ void deinit_Glyph(iGlyph *d) {
     iUnused(d);
 }
 
+#if 0
 static iChar codepoint_Glyph_(const iGlyph *d) {
     return d->node.key;
 }
+#endif
 
 iLocalDef iBool isRasterized_Glyph_(const iGlyph *d, int hoff) {
     return (d->flags & (rasterized0_GlyphFlag << hoff)) != 0;
@@ -152,10 +154,15 @@ static void init_Font(iFont *d, const iBlock *data, int height, float scale,
     memset(d->indexTable, 0xff, sizeof(d->indexTable));
 }
 
-static void deinit_Font(iFont *d) {
+static void clearGlyphs_Font_(iFont *d) {
     iForEach(Hash, i, &d->glyphs) {
         delete_Glyph((iGlyph *) i.value);
     }
+    clear_Hash(&d->glyphs);
+}
+
+static void deinit_Font(iFont *d) {
+    clearGlyphs_Font_(d);
     deinit_Hash(&d->glyphs);
     delete_Block(d->data);
 }
@@ -354,6 +361,10 @@ static void deinitFonts_Text_(iText *d) {
     }
 }
 
+static int maxGlyphHeight_Text_(const iText *d) {
+    return 2 * d->contentFontSize * fontSize_UI;
+}
+
 static void initCache_Text_(iText *d) {
     init_Array(&d->cacheRows, sizeof(iCacheRow));
     const int textSize = d->contentFontSize * fontSize_UI;
-- 
2.34.1