diff options
| author |  Giuliano Bellini <100347457+GyulyVGC@users.noreply.github.com> | 2023-02-22 21:23:04 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-02-22 21:23:04 +0100 |
| commit | 4f41927155e7d4bc38497b0e298a0b23ccea6ca1 (patch) | |
| tree | 70b7dbc1afdc62dfeaf42f0c62e8f4c01e407729 /graphics/src/renderer.rs | |
| parent | a35d6d2e4d59f71309f31c87ea5150959d639185 (diff) | |
| parent | 666f3cd143047e49a010f0c97eabc7136f92aa35 (diff) | |
| download | iced-4f41927155e7d4bc38497b0e298a0b23ccea6ca1.tar.gz iced-4f41927155e7d4bc38497b0e298a0b23ccea6ca1.tar.bz2 iced-4f41927155e7d4bc38497b0e298a0b23ccea6ca1.zip | |
Merge branch 'iced-rs:master' into master
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( |