Rename Image::fit to content_fit
... just for consistency!
This commit is contained in:
parent
8b5c9dfa71
commit
0aff444941
2 changed files with 12 additions and 8 deletions
|
|
@ -748,7 +748,7 @@ fn ferris<'a>(width: u16) -> Container<'a, StepMessage> {
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
.width(Length::Units(width))
|
.width(Length::Units(width))
|
||||||
.fit(ContentFit::Contain),
|
.content_fit(ContentFit::Contain),
|
||||||
)
|
)
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.center_x()
|
.center_x()
|
||||||
|
|
@ -769,7 +769,7 @@ fn logo<'a>(height: u16, fit: ContentFit) -> Container<'a, StepMessage> {
|
||||||
}
|
}
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.height(Length::Units(height))
|
.height(Length::Units(height))
|
||||||
.fit(fit),
|
.content_fit(fit),
|
||||||
)
|
)
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.center_x()
|
.center_x()
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ pub struct Image<Handle> {
|
||||||
handle: Handle,
|
handle: Handle,
|
||||||
width: Length,
|
width: Length,
|
||||||
height: Length,
|
height: Length,
|
||||||
fit: ContentFit,
|
content_fit: ContentFit,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<Handle> Image<Handle> {
|
impl<Handle> Image<Handle> {
|
||||||
|
|
@ -38,7 +38,7 @@ impl<Handle> Image<Handle> {
|
||||||
handle: handle.into(),
|
handle: handle.into(),
|
||||||
width: Length::Shrink,
|
width: Length::Shrink,
|
||||||
height: 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`].
|
/// Sets the [`ContentFit`] of the [`Image`].
|
||||||
///
|
///
|
||||||
/// Defaults to [`ContentFit::Contain`]
|
/// Defaults to [`ContentFit::Contain`]
|
||||||
pub fn fit(self, fit: ContentFit) -> Self {
|
pub fn content_fit(self, content_fit: ContentFit) -> Self {
|
||||||
Self { fit, ..self }
|
Self {
|
||||||
|
content_fit,
|
||||||
|
..self
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -91,7 +94,7 @@ where
|
||||||
.resolve(image_size);
|
.resolve(image_size);
|
||||||
|
|
||||||
// The uncropped size of the image when fit to the bounds above
|
// 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
|
// Shrink the widget to fit the resized image, if requested
|
||||||
let final_size = Size {
|
let final_size = Size {
|
||||||
|
|
@ -120,7 +123,8 @@ where
|
||||||
let (width, height) = renderer.dimensions(&self.handle);
|
let (width, height) = renderer.dimensions(&self.handle);
|
||||||
let image_size = Size::new(width as f32, height as f32);
|
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 bounds = layout.bounds();
|
||||||
|
|
||||||
let render = |renderer: &mut Renderer| {
|
let render = |renderer: &mut Renderer| {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue