diff options
Diffstat (limited to '')
| -rw-r--r-- | wgpu/src/backend.rs | 5 | ||||
| -rw-r--r-- | wgpu/src/text.rs | 13 | ||||
| -rw-r--r-- | wgpu/src/text/icons.ttf | bin | 4912 -> 0 bytes | 
3 files changed, 5 insertions, 13 deletions
| diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs index ba1a57a5..073a79e2 100644 --- a/wgpu/src/backend.rs +++ b/wgpu/src/backend.rs @@ -3,6 +3,7 @@ use crate::text;  use crate::triangle;  use crate::{Quad, Settings, Target, Transformation};  use iced_graphics::backend; +use iced_graphics::font;  use iced_graphics::Primitive;  use iced_native::mouse;  use iced_native::{Background, Font, Point, Rectangle, Size, Vector}; @@ -456,8 +457,8 @@ impl iced_graphics::Backend for Backend {  }  impl backend::Text for Backend { -    const ICON_FONT: Font = text::BUILTIN_ICONS; -    const CHECKMARK_ICON: char = text::CHECKMARK_ICON; +    const ICON_FONT: Font = font::ICONS; +    const CHECKMARK_ICON: char = font::CHECKMARK_ICON;      fn measure(          &self, diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs index ae9b6b22..c1782fe5 100644 --- a/wgpu/src/text.rs +++ b/wgpu/src/text.rs @@ -2,15 +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_wgpu icons", -    bytes: include_bytes!("text/icons.ttf"), -}; - -pub const CHECKMARK_ICON: char = '\u{F00C}'; - -const FALLBACK_FONT: &[u8] = include_bytes!("../fonts/Lato-Regular.ttf"); -  #[derive(Debug)]  pub struct Pipeline {      draw_brush: RefCell<wgpu_glyph::GlyphBrush<'static, ()>>, @@ -32,7 +23,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>| { @@ -51,7 +42,7 @@ impl Pipeline {              .unwrap_or_else(|_: wgpu_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 = brush_builder diff --git a/wgpu/src/text/icons.ttf b/wgpu/src/text/icons.ttfBinary files differ deleted file mode 100644 index 1c832f86..00000000 --- a/wgpu/src/text/icons.ttf +++ /dev/null | 
