diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/Cargo.toml | 6 | ||||
| -rw-r--r-- | graphics/src/backend.rs | 2 | ||||
| -rw-r--r-- | graphics/src/renderer.rs | 7 | ||||
| -rw-r--r-- | graphics/src/widget/canvas.rs | 14 |
4 files changed, 14 insertions, 15 deletions
diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml index 664bb19f..13ab61d8 100644 --- a/graphics/Cargo.toml +++ b/graphics/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "iced_graphics" -version = "0.6.0" +version = "0.7.0" authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"] edition = "2021" description = "A bunch of backend-agnostic types that can be leveraged to build a renderer for Iced" @@ -44,11 +44,11 @@ version = "1.4" features = ["derive"] [dependencies.iced_native] -version = "0.8" +version = "0.9" path = "../native" [dependencies.iced_style] -version = "0.6" +version = "0.7" path = "../style" [dependencies.lyon] diff --git a/graphics/src/backend.rs b/graphics/src/backend.rs index 2f8e9fc3..256b7ab5 100644 --- a/graphics/src/backend.rs +++ b/graphics/src/backend.rs @@ -32,7 +32,7 @@ pub trait Text { const ARROW_DOWN_ICON: char; /// Returns the default size of text. - fn default_size(&self) -> u16; + fn default_size(&self) -> f32; /// Measures the text contents with the given size and font, /// returning the size of a laid out paragraph that fits in the provided 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( diff --git a/graphics/src/widget/canvas.rs b/graphics/src/widget/canvas.rs index b070d0a6..a8d050f5 100644 --- a/graphics/src/widget/canvas.rs +++ b/graphics/src/widget/canvas.rs @@ -100,13 +100,13 @@ impl<Message, Theme, P> Canvas<Message, Theme, P> where P: Program<Message, Theme>, { - const DEFAULT_SIZE: u16 = 100; + const DEFAULT_SIZE: f32 = 100.0; /// Creates a new [`Canvas`]. pub fn new(program: P) -> Self { Canvas { - width: Length::Units(Self::DEFAULT_SIZE), - height: Length::Units(Self::DEFAULT_SIZE), + width: Length::Fixed(Self::DEFAULT_SIZE), + height: Length::Fixed(Self::DEFAULT_SIZE), program, message_: PhantomData, theme_: PhantomData, @@ -114,14 +114,14 @@ where } /// Sets the width of the [`Canvas`]. - pub fn width(mut self, width: Length) -> Self { - self.width = width; + pub fn width(mut self, width: impl Into<Length>) -> Self { + self.width = width.into(); self } /// Sets the height of the [`Canvas`]. - pub fn height(mut self, height: Length) -> Self { - self.height = height; + pub fn height(mut self, height: impl Into<Length>) -> Self { + self.height = height.into(); self } } |