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
graphics/Cargo.toml | 2 +
graphics/fonts/Icons.ttf | Bin 0 -> 4912 bytes
graphics/fonts/Lato-Regular.ttf | Bin 0 -> 75136 bytes
graphics/fonts/OFL.txt | 93 ++++++++++++++++++++++++++++++++++++++++
graphics/src/font.rs | 12 ++++++
wgpu/Cargo.toml | 2 +-
wgpu/fonts/Lato-Regular.ttf | Bin 75136 -> 0 bytes
wgpu/fonts/OFL.txt | 93 ----------------------------------------
wgpu/src/backend.rs | 5 ++-
wgpu/src/text.rs | 13 +-----
wgpu/src/text/icons.ttf | Bin 4912 -> 0 bytes
15 files changed, 119 insertions(+), 122 deletions(-)
delete mode 100644 glow/src/text/icons.ttf
create mode 100644 graphics/fonts/Icons.ttf
create mode 100644 graphics/fonts/Lato-Regular.ttf
create mode 100644 graphics/fonts/OFL.txt
delete mode 100644 wgpu/fonts/Lato-Regular.ttf
delete mode 100644 wgpu/fonts/OFL.txt
delete mode 100644 wgpu/src/text/icons.ttf
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
diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml
index c937763c..61f1f6d4 100644
--- a/graphics/Cargo.toml
+++ b/graphics/Cargo.toml
@@ -7,6 +7,8 @@ edition = "2018"
[features]
canvas = ["lyon"]
font-source = ["font-kit"]
+font-fallback = []
+font-icons = []
[dependencies]
bytemuck = "1.2"
diff --git a/graphics/fonts/Icons.ttf b/graphics/fonts/Icons.ttf
new file mode 100644
index 00000000..1c832f86
Binary files /dev/null and b/graphics/fonts/Icons.ttf differ
diff --git a/graphics/fonts/Lato-Regular.ttf b/graphics/fonts/Lato-Regular.ttf
new file mode 100644
index 00000000..33eba8b1
Binary files /dev/null and b/graphics/fonts/Lato-Regular.ttf differ
diff --git a/graphics/fonts/OFL.txt b/graphics/fonts/OFL.txt
new file mode 100644
index 00000000..dfca0da4
--- /dev/null
+++ b/graphics/fonts/OFL.txt
@@ -0,0 +1,93 @@
+Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato"
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/graphics/src/font.rs b/graphics/src/font.rs
index 3890beba..a490e609 100644
--- a/graphics/src/font.rs
+++ b/graphics/src/font.rs
@@ -8,3 +8,15 @@ pub use source::Source;
pub use font_kit::{
error::SelectionError as LoadError, family_name::FamilyName as Family,
};
+
+#[cfg(feature = "font-fallback")]
+pub const FALLBACK: &[u8] = include_bytes!("../fonts/Lato-Regular.ttf");
+
+#[cfg(feature = "font-icons")]
+pub const ICONS: iced_native::Font = iced_native::Font::External {
+ name: "iced_wgpu icons",
+ bytes: include_bytes!("../fonts/Icons.ttf"),
+};
+
+#[cfg(feature = "font-icons")]
+pub const CHECKMARK_ICON: char = '\u{F00C}';
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index b59c7fa3..35ea9c31 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -32,7 +32,7 @@ path = "../native"
[dependencies.iced_graphics]
version = "0.1"
path = "../graphics"
-features = ["font-source"]
+features = ["font-source", "font-fallback", "font-icons"]
[dependencies.image]
version = "0.23"
diff --git a/wgpu/fonts/Lato-Regular.ttf b/wgpu/fonts/Lato-Regular.ttf
deleted file mode 100644
index 33eba8b1..00000000
Binary files a/wgpu/fonts/Lato-Regular.ttf and /dev/null differ
diff --git a/wgpu/fonts/OFL.txt b/wgpu/fonts/OFL.txt
deleted file mode 100644
index dfca0da4..00000000
--- a/wgpu/fonts/OFL.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato"
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
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.ttf
deleted file mode 100644
index 1c832f86..00000000
Binary files a/wgpu/src/text/icons.ttf and /dev/null differ
--
cgit