diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-01-11 00:44:56 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-01-11 00:44:56 +0100 |
| commit | de71776e02495df5dc962fb8b8853f666ab8be4f (patch) | |
| tree | 1f87cc68dc554783c6102f3587377f9956bcddba /wgpu/src/renderer/widget/text.rs | |
| parent | e879982cfdf0c6a1c6781a9bc46e0a77839de88f (diff) | |
| parent | 84f1a936db93c16255a07f079c47e351635586f4 (diff) | |
| download | iced-de71776e02495df5dc962fb8b8853f666ab8be4f.tar.gz iced-de71776e02495df5dc962fb8b8853f666ab8be4f.tar.bz2 iced-de71776e02495df5dc962fb8b8853f666ab8be4f.zip | |
Merge branch 'master' into paint-example
Diffstat (limited to 'wgpu/src/renderer/widget/text.rs')
| -rw-r--r-- | wgpu/src/renderer/widget/text.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/wgpu/src/renderer/widget/text.rs b/wgpu/src/renderer/widget/text.rs index 08a162ba..d61c5523 100644 --- a/wgpu/src/renderer/widget/text.rs +++ b/wgpu/src/renderer/widget/text.rs @@ -27,6 +27,7 @@ impl text::Renderer for Renderer { fn draw( &mut self, + defaults: &Self::Defaults, bounds: Rectangle, content: &str, size: u16, @@ -40,7 +41,7 @@ impl text::Renderer for Renderer { content: content.to_string(), size: f32::from(size), bounds, - color: color.unwrap_or(Color::BLACK), + color: color.unwrap_or(defaults.text.color), font, horizontal_alignment, vertical_alignment, |