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/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/text.rs')
| -rw-r--r-- | wgpu/src/text.rs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs index 880ad1a6..ab9a2f71 100644 --- a/wgpu/src/text.rs +++ b/wgpu/src/text.rs @@ -22,13 +22,16 @@ pub struct Pipeline { } impl Pipeline { - pub fn new(device: &mut wgpu::Device) -> Self { + pub fn new(device: &mut wgpu::Device, default_font: Option<&[u8]>) -> Self { // TODO: Font customization let font_source = font::Source::new(); - let default_font = font_source - .load(&[font::Family::SansSerif, font::Family::Serif]) - .unwrap_or_else(|_| FALLBACK_FONT.to_vec()); + let default_font = + default_font.map(|slice| slice.to_vec()).unwrap_or_else(|| { + font_source + .load(&[font::Family::SansSerif, font::Family::Serif]) + .unwrap_or_else(|_| FALLBACK_FONT.to_vec()) + }); let load_glyph_brush = |font: Vec<u8>| { let builder = |