From f0480854a9cd76f443848dbfa14256089b56abfe Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 19 May 2020 20:30:46 +0200
Subject: Move built-in fonts to `iced_graphics`
---
glow/Cargo.toml | 2 +-
glow/src/backend.rs | 5 +++--
glow/src/text.rs | 14 ++------------
glow/src/text/icons.ttf | Bin 4912 -> 0 bytes
4 files changed, 6 insertions(+), 15 deletions(-)
delete mode 100644 glow/src/text/icons.ttf
(limited to 'glow')
diff --git a/glow/Cargo.toml b/glow/Cargo.toml
index 158e2bf0..72ed8758 100644
--- a/glow/Cargo.toml
+++ b/glow/Cargo.toml
@@ -23,7 +23,7 @@ path = "../native"
[dependencies.iced_graphics]
version = "0.1"
path = "../graphics"
-features = ["font-source"]
+features = ["font-source", "font-fallback", "font-icons"]
[dependencies.surfman]
path = "../../surfman/surfman"
diff --git a/glow/src/backend.rs b/glow/src/backend.rs
index 7293eba1..94683e56 100644
--- a/glow/src/backend.rs
+++ b/glow/src/backend.rs
@@ -3,6 +3,7 @@ use crate::text;
use crate::triangle;
use crate::{Quad, Settings, Transformation, Viewport};
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};
@@ -404,8 +405,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/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 =
diff --git a/glow/src/text/icons.ttf b/glow/src/text/icons.ttf
deleted file mode 100644
index 1c832f86..00000000
Binary files a/glow/src/text/icons.ttf and /dev/null differ
--
cgit