summaryrefslogtreecommitdiffstats
path: root/src/settings.rs
diff options
context:
space:
mode:
authorLibravatar Bingus <shankern@protonmail.com>2023-02-17 11:45:34 -0800
committerLibravatar Bingus <shankern@protonmail.com>2023-02-17 11:45:34 -0800
commit744cef5608a91fe55cbbe1adb73a9a0b5e266668 (patch)
treef88ca6ae3c481e2de74178bb3f0d1f1b685e1740 /src/settings.rs
parent8da098330b58542cc929f4f24d02e26bd654bae4 (diff)
parent7dc1fb488ddbd12519571b51d75ae0c28875911d (diff)
downloadiced-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/settings.rs')
-rw-r--r--src/settings.rs6
1 files changed, 3 insertions, 3 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,