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

Keep using Ferris in the image section of the tour

Browse source 
Wide ferris is cute :3
This commit is contained in:
Héctor Ramón Jiménez 2022-02-16 18:16:22 +07:00
parent 15b4bbd49d
commit 6f6ce15a20
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
1 changed files with 7 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

33
examples/tour/src/main.rs
View file

@ -612,7 +612,7 @@ impl<'a> Step {
Self::container("Image") Self::container("Image")
.push(Text::new("Pictures of things in all shapes and sizes!")) .push(Text::new("Pictures of things in all shapes and sizes!"))
.push(logo(height, current_fit)) .push(ferris(height, current_fit))
.push(Slider::new( .push(Slider::new(
slider, slider,
50..=500, 50..=500,
@ -647,7 +647,7 @@ impl<'a> Step {
.horizontal_alignment(alignment::Horizontal::Center), .horizontal_alignment(alignment::Horizontal::Center),
) )
.push(Column::new().height(Length::Units(4096))) .push(Column::new().height(Length::Units(4096)))
.push(ferris(200)) .push(ferris(200, ContentFit::Contain))
.push( .push(
Text::new("You made it!") Text::new("You made it!")
.width(Length::Fill) .width(Length::Fill)
@ -733,8 +733,10 @@ impl<'a> Step {
} }
} }
/// Passing fit=None defaults to ContentFit::Contain fn ferris<'a>(
fn ferris<'a>(width: u16) -> Container<'a, StepMessage> { height: u16,
content_fit: ContentFit,
) -> Container<'a, StepMessage> {
Container::new( Container::new(
// This should go away once we unify resource loading on native // This should go away once we unify resource loading on native
// platforms // platforms
@ -746,29 +748,8 @@ fn ferris<'a>(width: u16) -> Container<'a, StepMessage> {
env!("CARGO_MANIFEST_DIR"), env!("CARGO_MANIFEST_DIR"),
)) ))
} }
.width(Length::Units(width))
.content_fit(ContentFit::Contain),
)
.width(Length::Fill)
.center_x()
}
/// Passing fit=None defaults to ContentFit::Contain
fn logo<'a>(height: u16, fit: ContentFit) -> Container<'a, StepMessage> {
Container::new(
// This should go away once we unify resource loading on native
// platforms
if cfg!(target_arch = "wasm32") {
Image::new("tour/images/logo.png")
} else {
Image::new(format!(
"{}/images/logo.png",
env!("CARGO_MANIFEST_DIR"),
))
}
.width(Length::Fill)
.height(Length::Units(height)) .height(Length::Units(height))
.content_fit(fit), .content_fit(content_fit),
) )
.width(Length::Fill) .width(Length::Fill)
.center_x() .center_x()