diff options
| author |  Héctor Ramón <hector0193@gmail.com> | 2023-09-07 03:49:44 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-09-07 03:49:44 +0200 |
| commit | 6fc88c3c80385b6d7289e8aecff4e3822519e657 (patch) | |
| tree | eaf7024bc1e9e4de508e0cbb0e2806864698037f | |
| parent | d1822ad8116604590b7e9be51fc0aea4292a0760 (diff) | |
| parent | cee0ed64694e06eb3061acc1abd76deded3e0648 (diff) | |
| download | iced-6fc88c3c80385b6d7289e8aecff4e3822519e657.tar.gz iced-6fc88c3c80385b6d7289e8aecff4e3822519e657.tar.bz2 iced-6fc88c3c80385b6d7289e8aecff4e3822519e657.zip | |
Merge pull request #2059 from joshuamegnauth54/ensure_nonzero_text_lineheight
[issue #2002] Ensure that absolute `LineHeight` is always > 0.0
| -rw-r--r-- | tiny_skia/src/text.rs | 5 | ||||
| -rw-r--r-- | wgpu/src/text.rs | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs index 08fde4bf..306b400a 100644 --- 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 index fb13545d..9c42be0e 100644 --- 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( |