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

Allow configuration of default font

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2020-01-01 17:49:48 +01:00
parent e1062a02d1
commit d96ced8e2d
8 changed files with 39 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/application.rs
View file

@ -151,7 +151,12 @@ pub trait Application: Sized {
Self: 'static,
{
#[cfg(not(target_arch = "wasm32"))]
<Instance<Self> as iced_winit::Application>::run(_settings.into());
<Instance<Self> as iced_winit::Application>::run(
_settings.into(),
iced_wgpu::Settings {
default_font: _settings.default_font,
},
);
#[cfg(target_arch = "wasm32")]
<Instance<Self> as iced_web::Application>::run();

4
src/settings.rs
View file

@ -15,6 +15,9 @@ pub struct Settings {
///
/// [`Color`]: ../struct.Color.html
pub background: Color,
// TODO: Add `name` for web compatibility
pub default_font: Option<&'static [u8]>,
}
impl Default for Settings {
@ -22,6 +25,7 @@ impl Default for Settings {
Settings {
window: Window::default(),
background: Color::WHITE,
default_font: None,
}
}
}