Rename Image::fit to content_fit

... just for consistency!
This commit is contained in:
Héctor Ramón Jiménez 2022-02-16 17:51:03 +07:00
parent 8b5c9dfa71
commit 0aff444941
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
2 changed files with 12 additions and 8 deletions

View file

@ -748,7 +748,7 @@ fn ferris<'a>(width: u16) -> Container<'a, StepMessage> {
))
}
.width(Length::Units(width))
.fit(ContentFit::Contain),
.content_fit(ContentFit::Contain),
)
.width(Length::Fill)
.center_x()
@ -769,7 +769,7 @@ fn logo<'a>(height: u16, fit: ContentFit) -> Container<'a, StepMessage> {
}
.width(Length::Fill)
.height(Length::Units(height))
.fit(fit),
.content_fit(fit),
)
.width(Length::Fill)
.center_x()

View file

@ -28,7 +28,7 @@ pub struct Image<Handle> {
handle: Handle,
width: Length,
height: Length,
fit: ContentFit,
content_fit: ContentFit,
}
impl<Handle> Image<Handle> {
@ -38,7 +38,7 @@ impl<Handle> Image<Handle> {
handle: handle.into(),
width: Length::Shrink,
height: Length::Shrink,
fit: ContentFit::Contain,
content_fit: ContentFit::Contain,
}
}
@ -57,8 +57,11 @@ impl<Handle> Image<Handle> {
/// Sets the [`ContentFit`] of the [`Image`].
///
/// Defaults to [`ContentFit::Contain`]
pub fn fit(self, fit: ContentFit) -> Self {
Self { fit, ..self }
pub fn content_fit(self, content_fit: ContentFit) -> Self {
Self {
content_fit,
..self
}
}
}
@ -91,7 +94,7 @@ where
.resolve(image_size);
// The uncropped size of the image when fit to the bounds above
let full_size = self.fit.fit(image_size, raw_size);
let full_size = self.content_fit.fit(image_size, raw_size);
// Shrink the widget to fit the resized image, if requested
let final_size = Size {
@ -120,7 +123,8 @@ where
let (width, height) = renderer.dimensions(&self.handle);
let image_size = Size::new(width as f32, height as f32);
let adjusted_fit = self.fit.fit(image_size, layout.bounds().size());
let adjusted_fit =
self.content_fit.fit(image_size, layout.bounds().size());
let bounds = layout.bounds();
let render = |renderer: &mut Renderer| {