diff options
author | 2023-02-17 11:45:34 -0800 | |
---|---|---|
committer | 2023-02-17 11:45:34 -0800 | |
commit | 744cef5608a91fe55cbbe1adb73a9a0b5e266668 (patch) | |
tree | f88ca6ae3c481e2de74178bb3f0d1f1b685e1740 /glow/src/backend.rs | |
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 'glow/src/backend.rs')
-rw-r--r-- | glow/src/backend.rs | 4 |
1 files changed, 2 insertions, 2 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 } |