diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2021-10-18 15:19:04 +0700 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2021-10-18 15:19:04 +0700 |
| commit | edea093350e1b576e2b7db50c525e7fa5c3bea9f (patch) | |
| tree | bcc93c11a804d04e5842cef6c2088911fd4ef822 /native/src/widget/text.rs | |
| parent | 54a9a232f8110364972a8eef966b7b7477573f4f (diff) | |
| download | iced-edea093350e1b576e2b7db50c525e7fa5c3bea9f.tar.gz iced-edea093350e1b576e2b7db50c525e7fa5c3bea9f.tar.bz2 iced-edea093350e1b576e2b7db50c525e7fa5c3bea9f.zip | |
Move `Defaults` from `iced_graphics` to `iced_native`
Diffstat (limited to '')
| -rw-r--r-- | native/src/widget/text.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/native/src/widget/text.rs b/native/src/widget/text.rs index ea1ba7ac..a2438d9c 100644 --- a/native/src/widget/text.rs +++ b/native/src/widget/text.rs @@ -135,7 +135,7 @@ where fn draw( &self, renderer: &mut Renderer, - _defaults: &Renderer::Defaults, + style: &renderer::Style, layout: Layout<'_>, _cursor_position: Point, _viewport: &Rectangle, @@ -156,9 +156,9 @@ where renderer.fill_text(renderer::text::Section { content: &self.content, - size: self.size.map(f32::from), + size: f32::from(self.size.unwrap_or(renderer.default_size())), bounds: Rectangle { x, y, ..bounds }, - color: self.color, + color: self.color.unwrap_or(style.text_color), font: self.font, horizontal_alignment: self.horizontal_alignment, vertical_alignment: self.vertical_alignment, |