diff options
author | 2023-09-11 02:47:24 +0200 | |
---|---|---|
committer | 2023-09-11 02:47:24 +0200 | |
commit | 346af3f8b0baa418fd37b878bc2930ff0bd57cc0 (patch) | |
tree | b11cde03595fb28bddb055507d272dd973634ab5 /widget/src/text_input.rs | |
parent | 9245423c5d82f88c99adecaaf5dd2ac3559a05a8 (diff) | |
download | iced-346af3f8b0baa418fd37b878bc2930ff0bd57cc0.tar.gz iced-346af3f8b0baa418fd37b878bc2930ff0bd57cc0.tar.bz2 iced-346af3f8b0baa418fd37b878bc2930ff0bd57cc0.zip |
Make `FontSystem` global and simplify `Paragraph` API
Diffstat (limited to 'widget/src/text_input.rs')
-rw-r--r-- | widget/src/text_input.rs | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs index 7d5ae806..f9a2d419 100644 --- a/widget/src/text_input.rs +++ b/widget/src/text_input.rs @@ -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(), |