diff options
| author |  Héctor Ramón <hector0193@gmail.com> | 2023-02-17 16:53:02 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-02-17 16:53:02 +0100 |
| commit | 7dc1fb488ddbd12519571b51d75ae0c28875911d (patch) | |
| tree | 92590830b23bb714ec8024766fef7273b041bbf3 /glow | |
| parent | f75e0202575ca6e3ebf7d817eecbf51e198506fd (diff) | |
| parent | fd1408693322f5bfdaee7f27bd098808658d7310 (diff) | |
| download | iced-7dc1fb488ddbd12519571b51d75ae0c28875911d.tar.gz iced-7dc1fb488ddbd12519571b51d75ae0c28875911d.tar.bz2 iced-7dc1fb488ddbd12519571b51d75ae0c28875911d.zip | |
Merge pull request #1711 from iced-rs/feature/generic-pixel-units
Generic pixel units
Diffstat (limited to '')
| -rw-r--r-- | glow/src/backend.rs | 4 | ||||
| -rw-r--r-- | glow/src/settings.rs | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/glow/src/backend.rs b/glow/src/backend.rs index 416c3b94..36a34eda 100644 --- a/glow/src/backend.rs +++ b/glow/src/backend.rs @@ -22,7 +22,7 @@ pub struct Backend { quad_pipeline: quad::Pipeline, text_pipeline: text::Pipeline, triangle_pipeline: triangle::Pipeline, - default_text_size: u16, + default_text_size: f32, } impl Backend { @@ -228,7 +228,7 @@ impl backend::Text for Backend { const CHECKMARK_ICON: char = font::CHECKMARK_ICON; const ARROW_DOWN_ICON: char = font::ARROW_DOWN_ICON; - fn default_size(&self) -> u16 { + fn default_size(&self) -> f32 { self.default_text_size } diff --git a/glow/src/settings.rs b/glow/src/settings.rs index 3691747b..8ccffbad 100644 --- a/glow/src/settings.rs +++ b/glow/src/settings.rs @@ -4,7 +4,7 @@ pub use iced_graphics::Antialiasing; /// The settings of a [`Backend`]. /// /// [`Backend`]: crate::Backend -#[derive(Clone, Copy, PartialEq, Eq)] +#[derive(Clone, Copy, PartialEq)] pub struct Settings { /// The bytes of the font that will be used by default. /// @@ -13,8 +13,8 @@ pub struct Settings { /// The default size of text. /// - /// By default, it will be set to 20. - pub default_text_size: u16, + /// By default, it will be set to `20.0`. + pub default_text_size: f32, /// If enabled, spread text workload in multiple threads when multiple cores /// are available. @@ -32,7 +32,7 @@ impl Default for Settings { fn default() -> Settings { Settings { default_font: None, - default_text_size: 20, + default_text_size: 20.0, text_multithreading: false, antialiasing: None, } |