Merge branch 'master' into explicit-text-caching

2023-09-10 00:34:21 +02:00 · 2023-09-10 00:34:21 +02:00 · b8e5693a30
commit b8e5693a30
parent 9565123389 a3489e4af9
178 changed files with 1768 additions and 1388 deletions
--- a/graphics/src/text/cache.rs
+++ b/graphics/src/text/cache.rs
@ -43,7 +43,10 @@ impl Cache {
        }

        if let hash_map::Entry::Vacant(entry) = self.entries.entry(hash) {
-            let metrics = cosmic_text::Metrics::new(key.size, key.line_height);
+            let metrics = cosmic_text::Metrics::new(
+                key.size,
+                key.line_height.max(f32::MIN_POSITIVE),
+            );
            let mut buffer = cosmic_text::Buffer::new(font_system, metrics);

            buffer.set_size(