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

Use generic Content in Text to avoid reallocation in fill_text

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-04-01 11:30:01 +02:00
parent c7a4fad4a2
commit 6216c513d5
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
10 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
widget/src/checkbox.rs
View file

@ -340,7 +340,7 @@ where
if self.is_checked {
renderer.fill_text(
text::Text {
content: &code_point.to_string(),
content: code_point.to_string(),
font: *font,
size,
line_height: *line_height,

2
widget/src/overlay/menu.rs
View file

@ -526,7 +526,7 @@ where
renderer.fill_text(
Text {
content: &option.to_string(),
content: option.to_string(),
bounds: Size::new(f32::INFINITY, bounds.height),
size: text_size,
line_height: self.text_line_height,

4
widget/src/pick_list.rs
View file

@ -479,7 +479,7 @@ where
renderer.fill_text(
Text {
content: &code_point.to_string(),
content: code_point.to_string(),
size,
line_height,
font,
@ -502,7 +502,7 @@ where
let label = selected.map(ToString::to_string);
if let Some(label) = label.as_deref().or(self.placeholder.as_deref()) {
if let Some(label) = label.or_else(|| self.placeholder.clone()) {
let text_size =
self.text_size.unwrap_or_else(|| renderer.default_size());

6
widget/src/text_input.rs
View file

@ -232,7 +232,7 @@ where
let placeholder_text = Text {
font,
line_height: self.line_height,
content: &self.placeholder,
content: self.placeholder.as_str(),
bounds: Size::new(f32::INFINITY, text_bounds.height),
size: text_size,
horizontal_alignment: alignment::Horizontal::Left,
@ -251,9 +251,11 @@ where
});
if let Some(icon) = &self.icon {
let mut content = [0; 4];
let icon_text = Text {
line_height: self.line_height,
content: &icon.code_point.to_string(),
content: icon.code_point.encode_utf8(&mut content) as &_,
font: icon.font,
size: icon.size.unwrap_or_else(|| renderer.default_size()),
bounds: Size::new(f32::INFINITY, text_bounds.height),