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

Overhaul Font type to allow font family selection

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-02-04 07:33:33 +01:00
parent a7580e0696
commit b29de28d1f
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
25 changed files with 147 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/application.rs
View file

@ -197,7 +197,6 @@ pub trait Application: Sized {
let renderer_settings = crate::renderer::Settings {
default_font: settings.default_font,
default_text_size: settings.default_text_size,
text_multithreading: settings.text_multithreading,
antialiasing: if settings.antialiasing {
Some(crate::renderer::settings::Antialiasing::MSAAx4)
} else {

18
src/settings.rs
View file

@ -1,5 +1,6 @@
//! Configure your application.
use crate::window;
use crate::Font;
/// The settings of an application.
#[derive(Debug, Clone)]
@ -20,23 +21,16 @@ pub struct Settings<Flags> {
/// [`Application`]: crate::Application
pub flags: Flags,
/// The bytes of the font that will be used by default.
/// The default [`Font`] to be used.
///
/// If `None` is provided, a default system font will be chosen.
// TODO: Add `name` for web compatibility
pub default_font: Option<&'static [u8]>,
/// By default, it uses [`Font::SansSerif`].
pub default_font: Font,
/// The text size that will be used by default.
///
/// The default value is `16.0`.
pub default_text_size: f32,
/// If enabled, spread text workload in multiple threads when multiple cores
/// are available.
///
/// By default, it is disabled.
pub text_multithreading: bool,
/// If set to true, the renderer will try to perform antialiasing for some
/// primitives.
///
@ -79,7 +73,6 @@ impl<Flags> Settings<Flags> {
window: default_settings.window,
default_font: default_settings.default_font,
default_text_size: default_settings.default_text_size,
text_multithreading: default_settings.text_multithreading,
antialiasing: default_settings.antialiasing,
exit_on_close_request: default_settings.exit_on_close_request,
try_opengles_first: default_settings.try_opengles_first,
@ -96,9 +89,8 @@ where
id: None,
window: Default::default(),
flags: Default::default(),
default_font: Default::default(),
default_font: Font::SansSerif,
default_text_size: 16.0,
text_multithreading: false,
antialiasing: false,
exit_on_close_request: true,
try_opengles_first: false,