From 7b8b01f560569ae18d9337a31ba94f6c1c2ba0dd Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 4 Feb 2023 12:24:13 +0100 Subject: Use `f32` in `Length::Units` and rename it to `Fixed` --- core/src/length.rs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'core/src/length.rs') 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 for Length { + fn from(amount: f32) -> Self { + Length::Fixed(amount) + } +} + impl From for Length { fn from(units: u16) -> Self { - Length::Units(units) + Length::Fixed(f32::from(units)) } } -- cgit