summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2024-04-01 11:30:01 +0200
committerLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2024-04-01 11:30:01 +0200
commit6216c513d5e5853bf1d43342094e91a74981f4f2 (patch)
treea11d3e6533485c5811f0f42d4cf5518c30626bdf /graphics
parentc7a4fad4a24dec8536f450d447a9852846f2d711 (diff)
downloadiced-6216c513d5e5853bf1d43342094e91a74981f4f2.tar.gz
iced-6216c513d5e5853bf1d43342094e91a74981f4f2.tar.bz2
iced-6216c513d5e5853bf1d43342094e91a74981f4f2.zip
Use generic `Content` in `Text` to avoid reallocation in `fill_text`
Diffstat (limited to 'graphics')
-rw-r--r--graphics/src/renderer.rs4
-rw-r--r--graphics/src/text/paragraph.rs4
2 files changed, 4 insertions, 4 deletions
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index f517ff3e..fb1a0d73 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -163,13 +163,13 @@ where
fn fill_text(
&mut self,
- text: Text<'_, Self::Font>,
+ text: Text,
position: Point,
color: Color,
clip_bounds: Rectangle,
) {
self.primitives.push(Primitive::Text {
- content: text.content.to_string(),
+ content: text.content,
bounds: Rectangle::new(position, text.bounds),
size: text.size,
line_height: text.line_height,
diff --git a/graphics/src/text/paragraph.rs b/graphics/src/text/paragraph.rs
index 5d027542..31a323ac 100644
--- a/graphics/src/text/paragraph.rs
+++ b/graphics/src/text/paragraph.rs
@@ -61,7 +61,7 @@ impl Paragraph {
impl core::text::Paragraph for Paragraph {
type Font = Font;
- fn with_text(text: Text<'_, Font>) -> Self {
+ fn with_text(text: Text<&str>) -> Self {
log::trace!("Allocating paragraph: {}", text.content);
let mut font_system =
@@ -146,7 +146,7 @@ impl core::text::Paragraph for Paragraph {
}
}
- fn compare(&self, text: Text<'_, Font>) -> core::text::Difference {
+ fn compare(&self, text: Text<&str>) -> core::text::Difference {
let font_system = text::font_system().read().expect("Read font system");
let paragraph = self.internal();
let metrics = paragraph.buffer.metrics();