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

Make FontSystem global and simplify Paragraph API

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-09-11 02:47:24 +02:00
parent 9245423c5d
commit 346af3f8b0
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
15 changed files with 165 additions and 328 deletions
Download patch file Download diff file Expand all files Collapse all files

22
widget/src/pick_list.rs
View file

@ -415,23 +415,17 @@ where
for (option, paragraph) in options.iter().zip(state.options.iter_mut()) {
let label = option.to_string();
renderer.update_paragraph(
paragraph,
Text {
content: &label,
..option_text
},
);
paragraph.update(Text {
content: &label,
..option_text
});
}
if let Some(placeholder) = placeholder {
renderer.update_paragraph(
&mut state.placeholder,
Text {
content: placeholder,
..option_text
},
);
state.placeholder.update(Text {
content: placeholder,
..option_text
});
}
let max_width = match width {

17
widget/src/text_input.rs
View file

@ -523,18 +523,15 @@ where
shaping: text::Shaping::Advanced,
};
renderer.update_paragraph(&mut state.placeholder, placeholder_text);
state.placeholder.update(placeholder_text);
let secure_value = is_secure.then(|| value.secure());
let value = secure_value.as_ref().unwrap_or(value);
renderer.update_paragraph(
&mut state.value,
Text {
content: &value.to_string(),
..placeholder_text
},
);
state.value.update(Text {
content: &value.to_string(),
..placeholder_text
});
if let Some(icon) = icon {
let icon_text = Text {
@ -548,7 +545,7 @@ where
shaping: text::Shaping::Advanced,
};
renderer.update_paragraph(&mut state.icon, icon_text);
state.icon.update(icon_text);
let icon_width = state.icon.min_width();
@ -1461,7 +1458,7 @@ fn replace_paragraph<Renderer>(
let mut children_layout = layout.children();
let text_bounds = children_layout.next().unwrap().bounds();
state.value = renderer.create_paragraph(Text {
state.value = Renderer::Paragraph::with_text(Text {
font,
line_height,
content: &value.to_string(),