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 /graphics/src/renderer.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 'graphics/src/renderer.rs')
| -rw-r--r-- | graphics/src/renderer.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs index 298cf4a1..34b6eb1d 100644 --- a/graphics/src/renderer.rs +++ b/graphics/src/renderer.rs @@ -130,19 +130,18 @@ where const CHECKMARK_ICON: char = B::CHECKMARK_ICON; const ARROW_DOWN_ICON: char = B::ARROW_DOWN_ICON; - fn default_size(&self) -> u16 { + fn default_size(&self) -> f32 { self.backend().default_size() } fn measure( &self, content: &str, - size: u16, + size: f32, font: Font, bounds: Size, ) -> (f32, f32) { - self.backend() - .measure(content, f32::from(size), font, bounds) + self.backend().measure(content, size, font, bounds) } fn hit_test( |