Embed Fira Sans font on Wasm builds by default
This commit is contained in:
parent
0c7f4eaab5
commit
35e2049ee6
5 changed files with 18 additions and 1 deletions
|
|
@ -18,7 +18,7 @@ all-features = true
|
|||
maintenance = { status = "actively-developed" }
|
||||
|
||||
[features]
|
||||
default = ["wgpu"]
|
||||
default = ["wgpu", "fira-sans"]
|
||||
# Enable the `wgpu` GPU-accelerated renderer backend
|
||||
wgpu = ["iced_renderer/wgpu", "iced_widget/wgpu"]
|
||||
# Enables the `Image` widget
|
||||
|
|
@ -53,6 +53,8 @@ highlighter = ["iced_highlighter"]
|
|||
multi-window = ["iced_winit/multi-window"]
|
||||
# Enables the advanced module
|
||||
advanced = []
|
||||
# Enables embedding Fira Sans as the default font on Wasm builds
|
||||
fira-sans = ["iced_renderer/fira-sans"]
|
||||
|
||||
[dependencies]
|
||||
iced_core.workspace = true
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ all-features = true
|
|||
geometry = ["lyon_path"]
|
||||
image = ["dep:image", "kamadak-exif"]
|
||||
web-colors = []
|
||||
fira-sans = []
|
||||
|
||||
[dependencies]
|
||||
iced_core.workspace = true
|
||||
|
|
|
|||
BIN
graphics/fonts/FiraSans-Regular.ttf
Normal file
BIN
graphics/fonts/FiraSans-Regular.ttf
Normal file
Binary file not shown.
|
|
@ -17,6 +17,15 @@ use once_cell::sync::OnceCell;
|
|||
use std::borrow::Cow;
|
||||
use std::sync::{Arc, RwLock, Weak};
|
||||
|
||||
/// The regular variant of the [Fira Sans] font.
|
||||
///
|
||||
/// It is loaded as part of the default fonts in Wasm builds.
|
||||
///
|
||||
/// [Fira Sans]: https://mozilla.github.io/Fira/
|
||||
#[cfg(all(target_arch = "wasm32", feature = "fira-sans"))]
|
||||
pub const FIRA_SANS_REGULAR: &'static [u8] =
|
||||
include_bytes!("../fonts/FiraSans-Regular.ttf").as_slice();
|
||||
|
||||
/// Returns the global [`FontSystem`].
|
||||
pub fn font_system() -> &'static RwLock<FontSystem> {
|
||||
static FONT_SYSTEM: OnceCell<RwLock<FontSystem>> = OnceCell::new();
|
||||
|
|
@ -27,6 +36,10 @@ pub fn font_system() -> &'static RwLock<FontSystem> {
|
|||
cosmic_text::fontdb::Source::Binary(Arc::new(
|
||||
include_bytes!("../fonts/Iced-Icons.ttf").as_slice(),
|
||||
)),
|
||||
#[cfg(all(target_arch = "wasm32", feature = "fira-sans"))]
|
||||
cosmic_text::fontdb::Source::Binary(Arc::new(
|
||||
include_bytes!("../fonts/FiraSans-Regular.ttf").as_slice(),
|
||||
)),
|
||||
]),
|
||||
version: Version::default(),
|
||||
})
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ geometry = ["iced_graphics/geometry", "iced_tiny_skia/geometry", "iced_wgpu?/geo
|
|||
tracing = ["iced_wgpu?/tracing"]
|
||||
web-colors = ["iced_wgpu?/web-colors"]
|
||||
webgl = ["iced_wgpu?/webgl"]
|
||||
fira-sans = ["iced_graphics/fira-sans"]
|
||||
|
||||
[dependencies]
|
||||
iced_graphics.workspace = true
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue