diff options
| author |  Bingus <shankern@protonmail.com> | 2023-02-17 11:45:34 -0800 |
|---|---|---|
| committer | Bingus <shankern@protonmail.com> | 2023-02-17 11:45:34 -0800 |
| commit | 744cef5608a91fe55cbbe1adb73a9a0b5e266668 (patch) | |
| tree | f88ca6ae3c481e2de74178bb3f0d1f1b685e1740 /wgpu/src | |
| parent | 8da098330b58542cc929f4f24d02e26bd654bae4 (diff) | |
| parent | 7dc1fb488ddbd12519571b51d75ae0c28875911d (diff) | |
| download | iced-744cef5608a91fe55cbbe1adb73a9a0b5e266668.tar.gz iced-744cef5608a91fe55cbbe1adb73a9a0b5e266668.tar.bz2 iced-744cef5608a91fe55cbbe1adb73a9a0b5e266668.zip | |
Merge remote-tracking branch 'origin/master' into feat/multi-window-support
# Conflicts:
# winit/src/window.rs
Diffstat (limited to 'wgpu/src')
| -rw-r--r-- | wgpu/src/backend.rs | 4 | ||||
| -rw-r--r-- | wgpu/src/settings.rs | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs index 9ab12ce0..6a299425 100644 --- a/wgpu/src/backend.rs +++ b/wgpu/src/backend.rs @@ -29,7 +29,7 @@ pub struct Backend { #[cfg(any(feature = "image", feature = "svg"))] image_pipeline: image::Pipeline, - default_text_size: u16, + default_text_size: f32, } impl Backend { @@ -265,7 +265,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/wgpu/src/settings.rs b/wgpu/src/settings.rs index 21c2427d..fd3b990a 100644 --- a/wgpu/src/settings.rs +++ b/wgpu/src/settings.rs @@ -4,7 +4,7 @@ pub use crate::Antialiasing; /// The settings of a [`Backend`]. /// /// [`Backend`]: crate::Backend -#[derive(Debug, Clone, Copy, PartialEq, Eq)] +#[derive(Debug, Clone, Copy, PartialEq)] pub struct Settings { /// The present mode of the [`Backend`]. /// @@ -21,8 +21,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 `16.0`. + pub default_text_size: f32, /// If enabled, spread text workload in multiple threads when multiple cores /// are available. @@ -66,7 +66,7 @@ impl Default for Settings { present_mode: wgpu::PresentMode::AutoVsync, internal_backend: wgpu::Backends::all(), default_font: None, - default_text_size: 20, + default_text_size: 20.0, text_multithreading: false, antialiasing: None, } |