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 /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 'src')
| -rw-r--r-- | src/settings.rs | 6 | ||||
| -rw-r--r-- | src/widget.rs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/settings.rs b/src/settings.rs index d31448fb..0eb3e62d 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -28,8 +28,8 @@ pub struct Settings<Flags> { /// The text size that will be used by default. /// - /// The default value is 20. - pub default_text_size: u16, + /// The default value is `20.0`. + pub default_text_size: f32, /// If enabled, spread text workload in multiple threads when multiple cores /// are available. @@ -97,7 +97,7 @@ where window: Default::default(), flags: Default::default(), default_font: Default::default(), - default_text_size: 20, + default_text_size: 20.0, text_multithreading: false, antialiasing: false, exit_on_close_request: true, diff --git a/src/widget.rs b/src/widget.rs index 5bf7b6b4..7da5b82b 100644 --- a/src/widget.rs +++ b/src/widget.rs @@ -31,7 +31,7 @@ pub mod button { pub mod checkbox { //! Show toggle controls using checkboxes. - pub use iced_native::widget::checkbox::{Appearance, StyleSheet}; + pub use iced_native::widget::checkbox::{Appearance, Icon, StyleSheet}; /// A box that can be checked. pub type Checkbox<'a, Message, Renderer = crate::Renderer> = |