me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reuse entries in text::Cache in iced_wgpu

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-06-28 00:35:37 +02:00
parent af62ec1c87
commit 78ad365db2
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
10 changed files with 69 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/src/widget/text.rs
View file

@ -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)
}