diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-05-19 20:30:46 +0200 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-05-19 20:30:46 +0200 |
| commit | f0480854a9cd76f443848dbfa14256089b56abfe (patch) | |
| tree | c19af18f58e3bdb1cc4bf53e9b207b253b3ab99e /glow/src/text.rs | |
| parent | e0c4f1a08e756f11c30a99cd739fe78267e5040b (diff) | |
| download | iced-f0480854a9cd76f443848dbfa14256089b56abfe.tar.gz iced-f0480854a9cd76f443848dbfa14256089b56abfe.tar.bz2 iced-f0480854a9cd76f443848dbfa14256089b56abfe.zip | |
Move built-in fonts to `iced_graphics`
Diffstat (limited to 'glow/src/text.rs')
| -rw-r--r-- | glow/src/text.rs | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/glow/src/text.rs b/glow/src/text.rs index be88ceaf..952fd2cd 100644 --- a/glow/src/text.rs +++ b/glow/src/text.rs @@ -2,16 +2,6 @@ use crate::Transformation; use iced_graphics::font; use std::{cell::RefCell, collections::HashMap}; -pub const BUILTIN_ICONS: iced_native::Font = iced_native::Font::External { - name: "iced_glow icons", - bytes: include_bytes!("text/icons.ttf"), -}; - -pub const CHECKMARK_ICON: char = '\u{F00C}'; - -const FALLBACK_FONT: &[u8] = - include_bytes!("../../wgpu/fonts/Lato-Regular.ttf"); - #[derive(Debug)] pub struct Pipeline { draw_brush: RefCell<glow_glyph::GlyphBrush<'static>>, @@ -29,7 +19,7 @@ impl Pipeline { 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()) + .unwrap_or_else(|_| font::FALLBACK.to_vec()) }); let load_glyph_brush = |font: Vec<u8>| { @@ -48,7 +38,7 @@ impl Pipeline { .unwrap_or_else(|_: glow_glyph::rusttype::Error| { log::warn!("System font failed to load. Falling back to embedded font..."); - load_glyph_brush(FALLBACK_FONT.to_vec()).expect("Load fallback font") + load_glyph_brush(font::FALLBACK.to_vec()).expect("Load fallback font") }); let draw_brush = |