diff options
| author |  Héctor Ramón <hector0193@gmail.com> | 2020-06-01 21:47:45 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-06-01 21:47:45 +0200 |
| commit | d34f8e06c8e3cdbba07a272f346163cfc0f920a6 (patch) | |
| tree | 87da05d984bbac2458c41caf0cea8c5b2cc26c46 /glow/src/text.rs | |
| parent | 05750bf1863f8a6d2b797c4c482cd38dc45d7aeb (diff) | |
| parent | 86f0e3d4e244710eb925c8603368d191aa7daff7 (diff) | |
| download | iced-d34f8e06c8e3cdbba07a272f346163cfc0f920a6.tar.gz iced-d34f8e06c8e3cdbba07a272f346163cfc0f920a6.tar.bz2 iced-d34f8e06c8e3cdbba07a272f346163cfc0f920a6.zip | |
Merge pull request #370 from azriel91/improvement/58/feature-gate-font-kit
Improvement/58/feature gate font kit
Diffstat (limited to 'glow/src/text.rs')
| -rw-r--r-- | glow/src/text.rs | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/glow/src/text.rs b/glow/src/text.rs index 6dc7882c..925c7287 100644 --- a/glow/src/text.rs +++ b/glow/src/text.rs @@ -12,15 +12,20 @@ pub struct Pipeline { impl Pipeline { pub fn new(gl: &glow::Context, default_font: Option<&[u8]>) -> Self { + let default_font = default_font.map(|slice| slice.to_vec()); + // TODO: Font customization - let font_source = font::Source::new(); + #[cfg(feature = "default_system_font")] + let default_font = { + default_font.or_else(|| { + font::Source::new() + .load(&[font::Family::SansSerif, font::Family::Serif]) + .ok() + }) + }; 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(|_| font::FALLBACK.to_vec()) - }); + default_font.unwrap_or_else(|| font::FALLBACK.to_vec()); let font = ab_glyph::FontArc::try_from_vec(default_font) .unwrap_or_else(|_| { |