Merge pull request #2059 from joshuamegnauth54/ensure_nonzero_text_li…

…neheight [issue #2002] Ensure that absolute `LineHeight` is always > 0.0
iced-rs · Sep 7, 2023 · 6fc88c3 · 6fc88c3
2 parents d1822ad + cee0ed6
commit 6fc88c3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
@@ -405,7 +405,10 @@ impl Cache {
         }
 
         if let hash_map::Entry::Vacant(entry) = self.entries.entry(hash) {
-            let metrics = cosmic_text::Metrics::new(key.size, key.size * 1.2);
+            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(

diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
@@ -414,7 +414,10 @@ impl Cache {
         }
 
         if let hash_map::Entry::Vacant(entry) = self.entries.entry(hash) {
-            let metrics = glyphon::Metrics::new(key.size, key.line_height);
+            let metrics = glyphon::Metrics::new(
+                key.size,
+                key.line_height.max(f32::MIN_POSITIVE),
+            );
             let mut buffer = glyphon::Buffer::new(font_system, metrics);
 
             buffer.set_size(