diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2023-06-28 00:35:37 +0200 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2023-06-28 00:35:37 +0200 |
| commit | 78ad365db232e53cbdf12105e40c1dbe87a3238c (patch) | |
| tree | 4537c725dd9d15ca07d03403d083d3850841654a /core/src/widget | |
| parent | af62ec1c877d0d6d29277fb7dcfd4c681fd499af (diff) | |
| download | iced-78ad365db232e53cbdf12105e40c1dbe87a3238c.tar.gz iced-78ad365db232e53cbdf12105e40c1dbe87a3238c.tar.bz2 iced-78ad365db232e53cbdf12105e40c1dbe87a3238c.zip | |
Reuse entries in `text::Cache` in `iced_wgpu`
Diffstat (limited to 'core/src/widget')
| -rw-r--r-- | core/src/widget/text.rs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/core/src/widget/text.rs b/core/src/widget/text.rs index e934a2f5..79df2b02 100644 --- a/core/src/widget/text.rs +++ b/core/src/widget/text.rs @@ -5,7 +5,7 @@ use crate::mouse; use crate::renderer; use crate::text; use crate::widget::Tree; -use crate::{Color, Element, Layout, Length, Pixels, Rectangle, Size, Widget}; +use crate::{Color, Element, Layout, Length, Pixels, Rectangle, Widget}; use std::borrow::Cow; @@ -139,18 +139,16 @@ where let size = self.size.unwrap_or_else(|| renderer.default_size()); - let bounds = limits.max(); - - let (width, height) = renderer.measure( + let bounds = renderer.measure( &self.content, size, self.line_height, self.font.unwrap_or_else(|| renderer.default_font()), - bounds, + limits.max(), self.shaping, ); - let size = limits.resolve(Size::new(width, height)); + let size = limits.resolve(bounds); layout::Node::new(size) } |