diff options
author | 2023-02-17 11:45:34 -0800 | |
---|---|---|
committer | 2023-02-17 11:45:34 -0800 | |
commit | 744cef5608a91fe55cbbe1adb73a9a0b5e266668 (patch) | |
tree | f88ca6ae3c481e2de74178bb3f0d1f1b685e1740 /native/src/renderer/null.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 'native/src/renderer/null.rs')
-rw-r--r-- | native/src/renderer/null.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/native/src/renderer/null.rs b/native/src/renderer/null.rs index b1743dbf..9376d540 100644 --- a/native/src/renderer/null.rs +++ b/native/src/renderer/null.rs @@ -44,14 +44,14 @@ impl text::Renderer for Null { const CHECKMARK_ICON: char = '0'; const ARROW_DOWN_ICON: char = '0'; - fn default_size(&self) -> u16 { - 20 + fn default_size(&self) -> f32 { + 20.0 } fn measure( &self, _content: &str, - _size: u16, + _size: f32, _font: Font, _bounds: Size, ) -> (f32, f32) { |