me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Feature gate font-kit behind "default_system_font" feature.

Browse source
This commit is contained in:
Azriel Hoh 2020-05-30 19:23:16 +12:00
parent 05750bf186
commit ae9521e500
5 changed files with 31 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
glow/Cargo.toml
View file

@ -9,6 +9,7 @@ repository = "https://github.com/hecrj/iced"
[features]
canvas = ["iced_graphics/canvas"]
default_system_font = ["iced_graphics/font-source"]
# Not supported yet!
image = []
svg = []
@ -29,7 +30,7 @@ path = "../native"
[dependencies.iced_graphics]
version = "0.1"
path = "../graphics"
features = ["font-source", "font-fallback", "font-icons", "opengl"]
features = ["font-fallback", "font-icons", "opengl"]
[package.metadata.docs.rs]
rustdoc-args = ["--cfg", "docsrs"]

17
glow/src/text.rs
View file

@ -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(|_| {