diff options
author | 2023-02-04 12:24:13 +0100 | |
---|---|---|
committer | 2023-02-17 15:40:17 +0100 | |
commit | 7b8b01f560569ae18d9337a31ba94f6c1c2ba0dd (patch) | |
tree | ac9aac5eb82f175990da17813985d2f864897080 /core/src/length.rs | |
parent | f75e0202575ca6e3ebf7d817eecbf51e198506fd (diff) | |
download | iced-7b8b01f560569ae18d9337a31ba94f6c1c2ba0dd.tar.gz iced-7b8b01f560569ae18d9337a31ba94f6c1c2ba0dd.tar.bz2 iced-7b8b01f560569ae18d9337a31ba94f6c1c2ba0dd.zip |
Use `f32` in `Length::Units` and rename it to `Fixed`
Diffstat (limited to 'core/src/length.rs')
-rw-r--r-- | core/src/length.rs | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/core/src/length.rs b/core/src/length.rs index 95ea6e0e..bb925c4b 100644 --- a/core/src/length.rs +++ b/core/src/length.rs @@ -1,5 +1,5 @@ /// The strategy used to fill space in a specific dimension. -#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] +#[derive(Debug, Clone, Copy, PartialEq)] pub enum Length { /// Fill all the remaining space Fill, @@ -17,7 +17,7 @@ pub enum Length { Shrink, /// Fill a fixed amount of space - Units(u16), + Fixed(f32), } impl Length { @@ -31,13 +31,19 @@ impl Length { Length::Fill => 1, Length::FillPortion(factor) => *factor, Length::Shrink => 0, - Length::Units(_) => 0, + Length::Fixed(_) => 0, } } } +impl From<f32> for Length { + fn from(amount: f32) -> Self { + Length::Fixed(amount) + } +} + impl From<u16> for Length { fn from(units: u16) -> Self { - Length::Units(units) + Length::Fixed(f32::from(units)) } } |