me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use f32 in Length::Units and rename it to Fixed

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-02-04 12:24:13 +01:00
parent f75e020257
commit 7b8b01f560
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
43 changed files with 269 additions and 262 deletions
Download patch file Download diff file Expand all files Collapse all files

14
native/src/widget/progress_bar.rs
View file

@ -38,7 +38,7 @@ where
Renderer::Theme: StyleSheet,
{
/// The default height of a [`ProgressBar`].
pub const DEFAULT_HEIGHT: u16 = 30;
pub const DEFAULT_HEIGHT: f32 = 30.0;
/// Creates a new [`ProgressBar`].
///
@ -56,14 +56,14 @@ where
}
/// Sets the width of the [`ProgressBar`].
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 [`ProgressBar`].
pub fn height(mut self, height: Length) -> Self {
self.height = Some(height);
pub fn height(mut self, height: impl Into<Length>) -> Self {
self.height = Some(height.into());
self
}
@ -87,7 +87,7 @@ where
}
fn height(&self) -> Length {
self.height.unwrap_or(Length::Units(Self::DEFAULT_HEIGHT))
self.height.unwrap_or(Length::Fixed(Self::DEFAULT_HEIGHT))
}
fn layout(
@ -97,7 +97,7 @@ where
) -> layout::Node {
let limits = limits
.width(self.width)
.height(self.height.unwrap_or(Length::Units(Self::DEFAULT_HEIGHT)));
.height(self.height.unwrap_or(Length::Fixed(Self::DEFAULT_HEIGHT)));
let size = limits.resolve(Size::ZERO);