Fix Fira Sans not being used as default font on Wasm
This commit is contained in:
parent
6bf6fc60c9
commit
c335b256a1
1 changed files with 9 additions and 1 deletions
|
|
@ -31,7 +31,15 @@ impl Default for Settings {
|
||||||
impl From<core::Settings> for Settings {
|
impl From<core::Settings> for Settings {
|
||||||
fn from(settings: core::Settings) -> Self {
|
fn from(settings: core::Settings) -> Self {
|
||||||
Self {
|
Self {
|
||||||
default_font: settings.default_font,
|
default_font: if cfg!(all(
|
||||||
|
target_arch = "wasm32",
|
||||||
|
feature = "fira-sans"
|
||||||
|
)) && settings.default_font == Font::default()
|
||||||
|
{
|
||||||
|
Font::with_name("Fira Sans")
|
||||||
|
} else {
|
||||||
|
settings.default_font
|
||||||
|
},
|
||||||
default_text_size: settings.default_text_size,
|
default_text_size: settings.default_text_size,
|
||||||
antialiasing: settings.antialiasing.then_some(Antialiasing::MSAAx4),
|
antialiasing: settings.antialiasing.then_some(Antialiasing::MSAAx4),
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue