summaryrefslogtreecommitdiffstats
path: root/native/src/widget/text.rs
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2023-02-04 16:41:18 +0100
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2023-02-24 13:34:59 +0100
commita2ab9e939502ff36fd51115d9828fcdcd7bc104d (patch)
treeecc99b224081f905effdbc4494e07294a180e0be /native/src/widget/text.rs
parentde7fc637cf72eb14da17dac12510b41e8e3c4a71 (diff)
downloadiced-a2ab9e939502ff36fd51115d9828fcdcd7bc104d.tar.gz
iced-a2ab9e939502ff36fd51115d9828fcdcd7bc104d.tar.bz2
iced-a2ab9e939502ff36fd51115d9828fcdcd7bc104d.zip
Use `Pixels` for `Text::size`
Diffstat (limited to '')
-rw-r--r--native/src/widget/text.rs8
1 files changed, 3 insertions, 5 deletions
diff --git a/native/src/widget/text.rs b/native/src/widget/text.rs
index 235a027e..aede754a 100644
--- a/native/src/widget/text.rs
+++ b/native/src/widget/text.rs
@@ -160,15 +160,13 @@ where
_cursor_position: Point,
_viewport: &Rectangle,
) {
- let font = self.font.unwrap_or_else(|| renderer.default_font());
-
draw(
renderer,
style,
layout,
&self.content,
self.size,
- font,
+ self.font,
theme.appearance(self.style),
self.horizontal_alignment,
self.vertical_alignment,
@@ -192,7 +190,7 @@ pub fn draw<Renderer>(
layout: Layout<'_>,
content: &str,
size: Option<f32>,
- font: Renderer::Font,
+ font: Option<Renderer::Font>,
appearance: Appearance,
horizontal_alignment: alignment::Horizontal,
vertical_alignment: alignment::Vertical,
@@ -218,7 +216,7 @@ pub fn draw<Renderer>(
size: size.unwrap_or_else(|| renderer.default_size()),
bounds: Rectangle { x, y, ..bounds },
color: appearance.color.unwrap_or(style.text_color),
- font,
+ font: font.unwrap_or_else(|| renderer.default_font()),
horizontal_alignment,
vertical_alignment,
});