From 89acf0217e0acd92a82bff1fd516cd4266c0878a Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 30 Aug 2023 05:06:08 +0200
Subject: Use `min_bounds` for cached text

---
 graphics/src/text/cache.rs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'graphics')

diff --git a/graphics/src/text/cache.rs b/graphics/src/text/cache.rs
index 8aea6715..9e4fbf65 100644
--- a/graphics/src/text/cache.rs
+++ b/graphics/src/text/cache.rs
@@ -8,7 +8,7 @@ use std::hash::{BuildHasher, Hash, Hasher};
 #[allow(missing_debug_implementations)]
 #[derive(Default)]
 pub struct Cache {
-    entries: FxHashMap<KeyHash, cosmic_text::Buffer>,
+    entries: FxHashMap<KeyHash, Entry>,
     aliases: FxHashMap<KeyHash, KeyHash>,
     recently_used: FxHashSet<KeyHash>,
     hasher: HashBuilder,
@@ -25,7 +25,7 @@ impl Cache {
         Self::default()
     }
 
-    pub fn get(&self, key: &KeyHash) -> Option<&cosmic_text::Buffer> {
+    pub fn get(&self, key: &KeyHash) -> Option<&Entry> {
         self.entries.get(key)
     }
 
@@ -33,7 +33,7 @@ impl Cache {
         &mut self,
         font_system: &mut cosmic_text::FontSystem,
         key: Key<'_>,
-    ) -> (KeyHash, &mut cosmic_text::Buffer) {
+    ) -> (KeyHash, &mut Entry) {
         let hash = key.hash(self.hasher.build_hasher());
 
         if let Some(hash) = self.aliases.get(&hash) {
@@ -59,7 +59,10 @@ impl Cache {
             );
 
             let bounds = text::measure(&buffer);
-            let _ = entry.insert(buffer);
+            let _ = entry.insert(Entry {
+                buffer,
+                min_bounds: bounds,
+            });
 
             for bounds in [
                 bounds,
@@ -118,3 +121,9 @@ impl Key<'_> {
 }
 
 pub type KeyHash = u64;
+
+#[allow(missing_debug_implementations)]
+pub struct Entry {
+    pub buffer: cosmic_text::Buffer,
+    pub min_bounds: Size,
+}
-- 
cgit