From 6572909ab5b004176f6d261b67b4caa99f1f54bb Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 12 Dec 2024 03:14:40 +0100 Subject: Embed and use Fira Sans as default font when testing --- graphics/src/text.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'graphics') diff --git a/graphics/src/text.rs b/graphics/src/text.rs index feb9932a..e6f06b61 100644 --- a/graphics/src/text.rs +++ b/graphics/src/text.rs @@ -149,8 +149,8 @@ impl Text { /// 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] = +#[cfg(feature = "fira-sans")] +pub const FIRA_SANS_REGULAR: &[u8] = include_bytes!("../fonts/FiraSans-Regular.ttf").as_slice(); /// Returns the global [`FontSystem`]. @@ -163,7 +163,7 @@ pub fn font_system() -> &'static RwLock { cosmic_text::fontdb::Source::Binary(Arc::new( include_bytes!("../fonts/Iced-Icons.ttf").as_slice(), )), - #[cfg(all(target_arch = "wasm32", feature = "fira-sans"))] + #[cfg(feature = "fira-sans")] cosmic_text::fontdb::Source::Binary(Arc::new( include_bytes!("../fonts/FiraSans-Regular.ttf").as_slice(), )), -- cgit