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

Embed Fira Sans font on Wasm builds by default

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-02-20 03:20:58 +01:00
parent 0c7f4eaab5
commit 35e2049ee6
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
5 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
graphics/Cargo.toml
View file

@ -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
View file

Binary file not shown.

13
graphics/src/text.rs
View file

@ -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(),
})