diff options
author | 2023-02-17 16:53:02 +0100 | |
---|---|---|
committer | 2023-02-17 16:53:02 +0100 | |
commit | 7dc1fb488ddbd12519571b51d75ae0c28875911d (patch) | |
tree | 92590830b23bb714ec8024766fef7273b041bbf3 /graphics/src/widget/canvas.rs | |
parent | f75e0202575ca6e3ebf7d817eecbf51e198506fd (diff) | |
parent | fd1408693322f5bfdaee7f27bd098808658d7310 (diff) | |
download | iced-7dc1fb488ddbd12519571b51d75ae0c28875911d.tar.gz iced-7dc1fb488ddbd12519571b51d75ae0c28875911d.tar.bz2 iced-7dc1fb488ddbd12519571b51d75ae0c28875911d.zip |
Merge pull request #1711 from iced-rs/feature/generic-pixel-units
Generic pixel units
Diffstat (limited to 'graphics/src/widget/canvas.rs')
-rw-r--r-- | graphics/src/widget/canvas.rs | 14 |
1 files changed, 7 insertions, 7 deletions
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 } } |