Make horizontal_space and vertical_space fill by default
This commit is contained in:
parent
9dd20ead08
commit
e8049af23d
16 changed files with 54 additions and 46 deletions
|
|
@ -68,7 +68,7 @@ impl Sandbox for Example {
|
||||||
text(&self.text),
|
text(&self.text),
|
||||||
"What is your language?",
|
"What is your language?",
|
||||||
combo_box,
|
combo_box,
|
||||||
vertical_space(150),
|
vertical_space().height(150),
|
||||||
]
|
]
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.align_items(Alignment::Center)
|
.align_items(Alignment::Center)
|
||||||
|
|
|
||||||
|
|
@ -155,7 +155,7 @@ impl Application for Editor {
|
||||||
"Save file",
|
"Save file",
|
||||||
self.is_dirty.then_some(Message::SaveFile)
|
self.is_dirty.then_some(Message::SaveFile)
|
||||||
),
|
),
|
||||||
horizontal_space(Length::Fill),
|
horizontal_space(),
|
||||||
pick_list(
|
pick_list(
|
||||||
highlighter::Theme::ALL,
|
highlighter::Theme::ALL,
|
||||||
Some(self.theme),
|
Some(self.theme),
|
||||||
|
|
@ -179,7 +179,7 @@ impl Application for Editor {
|
||||||
} else {
|
} else {
|
||||||
String::from("New file")
|
String::from("New file")
|
||||||
}),
|
}),
|
||||||
horizontal_space(Length::Fill),
|
horizontal_space(),
|
||||||
text({
|
text({
|
||||||
let (line, column) = self.content.cursor_position();
|
let (line, column) = self.content.cursor_position();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,7 @@ impl Sandbox for Gradient {
|
||||||
transparent,
|
transparent,
|
||||||
} = *self;
|
} = *self;
|
||||||
|
|
||||||
let gradient_box = container(horizontal_space(Length::Fill))
|
let gradient_box = container(horizontal_space())
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.height(Length::Fill)
|
.height(Length::Fill)
|
||||||
.style(move |_: &_| {
|
.style(move |_: &_| {
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,7 @@ impl Application for Layout {
|
||||||
fn view(&self) -> Element<Message> {
|
fn view(&self) -> Element<Message> {
|
||||||
let header = row![
|
let header = row![
|
||||||
text(self.example.title).size(20).font(Font::MONOSPACE),
|
text(self.example.title).size(20).font(Font::MONOSPACE),
|
||||||
horizontal_space(Length::Fill),
|
horizontal_space(),
|
||||||
checkbox("Explain", self.explain)
|
checkbox("Explain", self.explain)
|
||||||
.on_toggle(Message::ExplainToggled),
|
.on_toggle(Message::ExplainToggled),
|
||||||
pick_list(Theme::ALL, Some(&self.theme), Message::ThemeSelected),
|
pick_list(Theme::ALL, Some(&self.theme), Message::ThemeSelected),
|
||||||
|
|
@ -117,7 +117,7 @@ impl Application for Layout {
|
||||||
.on_press(Message::Previous)
|
.on_press(Message::Previous)
|
||||||
.into(),
|
.into(),
|
||||||
),
|
),
|
||||||
Some(horizontal_space(Length::Fill).into()),
|
Some(horizontal_space().into()),
|
||||||
(!self.example.is_last()).then_some(
|
(!self.example.is_last()).then_some(
|
||||||
button("Next →")
|
button("Next →")
|
||||||
.padding([5, 10])
|
.padding([5, 10])
|
||||||
|
|
@ -251,16 +251,16 @@ fn row_<'a>() -> Element<'a, Message> {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn space<'a>() -> Element<'a, Message> {
|
fn space<'a>() -> Element<'a, Message> {
|
||||||
row!["Left!", horizontal_space(Length::Fill), "Right!"].into()
|
row!["Left!", horizontal_space(), "Right!"].into()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn application<'a>() -> Element<'a, Message> {
|
fn application<'a>() -> Element<'a, Message> {
|
||||||
let header = container(
|
let header = container(
|
||||||
row![
|
row![
|
||||||
square(40),
|
square(40),
|
||||||
horizontal_space(Length::Fill),
|
horizontal_space(),
|
||||||
"Header!",
|
"Header!",
|
||||||
horizontal_space(Length::Fill),
|
horizontal_space(),
|
||||||
square(40),
|
square(40),
|
||||||
]
|
]
|
||||||
.padding(10)
|
.padding(10)
|
||||||
|
|
|
||||||
|
|
@ -186,7 +186,7 @@ impl Sandbox for App {
|
||||||
row![
|
row![
|
||||||
text(&item.name)
|
text(&item.name)
|
||||||
.style(theme::Text::Color(item.color.into())),
|
.style(theme::Text::Color(item.color.into())),
|
||||||
horizontal_space(Length::Fill),
|
horizontal_space(),
|
||||||
pick_list(Color::ALL, Some(item.color), move |color| {
|
pick_list(Color::ALL, Some(item.color), move |color| {
|
||||||
Message::ItemColorChanged(item.clone(), color)
|
Message::ItemColorChanged(item.clone(), color)
|
||||||
}),
|
}),
|
||||||
|
|
|
||||||
|
|
@ -111,13 +111,9 @@ impl Application for App {
|
||||||
fn view(&self) -> Element<Message> {
|
fn view(&self) -> Element<Message> {
|
||||||
let content = container(
|
let content = container(
|
||||||
column![
|
column![
|
||||||
row![
|
row![text("Top Left"), horizontal_space(), text("Top Right")]
|
||||||
text("Top Left"),
|
.align_items(Alignment::Start)
|
||||||
horizontal_space(Length::Fill),
|
.height(Length::Fill),
|
||||||
text("Top Right")
|
|
||||||
]
|
|
||||||
.align_items(Alignment::Start)
|
|
||||||
.height(Length::Fill),
|
|
||||||
container(
|
container(
|
||||||
button(text("Show Modal")).on_press(Message::ShowModal)
|
button(text("Show Modal")).on_press(Message::ShowModal)
|
||||||
)
|
)
|
||||||
|
|
@ -127,7 +123,7 @@ impl Application for App {
|
||||||
.height(Length::Fill),
|
.height(Length::Fill),
|
||||||
row![
|
row![
|
||||||
text("Bottom Left"),
|
text("Bottom Left"),
|
||||||
horizontal_space(Length::Fill),
|
horizontal_space(),
|
||||||
text("Bottom Right")
|
text("Bottom Right")
|
||||||
]
|
]
|
||||||
.align_items(Alignment::End)
|
.align_items(Alignment::End)
|
||||||
|
|
|
||||||
|
|
@ -43,10 +43,10 @@ impl Sandbox for Example {
|
||||||
.placeholder("Choose a language...");
|
.placeholder("Choose a language...");
|
||||||
|
|
||||||
let content = column![
|
let content = column![
|
||||||
vertical_space(600),
|
vertical_space().height(600),
|
||||||
"Which is your favorite language?",
|
"Which is your favorite language?",
|
||||||
pick_list,
|
pick_list,
|
||||||
vertical_space(600),
|
vertical_space().height(600),
|
||||||
]
|
]
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.align_items(Alignment::Center)
|
.align_items(Alignment::Center)
|
||||||
|
|
|
||||||
|
|
@ -216,9 +216,9 @@ impl Application for ScrollableDemo {
|
||||||
column![
|
column![
|
||||||
scroll_to_end_button(),
|
scroll_to_end_button(),
|
||||||
text("Beginning!"),
|
text("Beginning!"),
|
||||||
vertical_space(1200),
|
vertical_space().height(1200),
|
||||||
text("Middle!"),
|
text("Middle!"),
|
||||||
vertical_space(1200),
|
vertical_space().height(1200),
|
||||||
text("End!"),
|
text("End!"),
|
||||||
scroll_to_beginning_button(),
|
scroll_to_beginning_button(),
|
||||||
]
|
]
|
||||||
|
|
@ -241,9 +241,9 @@ impl Application for ScrollableDemo {
|
||||||
row![
|
row![
|
||||||
scroll_to_end_button(),
|
scroll_to_end_button(),
|
||||||
text("Beginning!"),
|
text("Beginning!"),
|
||||||
horizontal_space(1200),
|
horizontal_space().width(1200),
|
||||||
text("Middle!"),
|
text("Middle!"),
|
||||||
horizontal_space(1200),
|
horizontal_space().width(1200),
|
||||||
text("End!"),
|
text("End!"),
|
||||||
scroll_to_beginning_button(),
|
scroll_to_beginning_button(),
|
||||||
]
|
]
|
||||||
|
|
@ -268,25 +268,25 @@ impl Application for ScrollableDemo {
|
||||||
row![
|
row![
|
||||||
column![
|
column![
|
||||||
text("Let's do some scrolling!"),
|
text("Let's do some scrolling!"),
|
||||||
vertical_space(2400)
|
vertical_space().height(2400)
|
||||||
],
|
],
|
||||||
scroll_to_end_button(),
|
scroll_to_end_button(),
|
||||||
text("Horizontal - Beginning!"),
|
text("Horizontal - Beginning!"),
|
||||||
horizontal_space(1200),
|
horizontal_space().width(1200),
|
||||||
//vertical content
|
//vertical content
|
||||||
column![
|
column![
|
||||||
text("Horizontal - Middle!"),
|
text("Horizontal - Middle!"),
|
||||||
scroll_to_end_button(),
|
scroll_to_end_button(),
|
||||||
text("Vertical - Beginning!"),
|
text("Vertical - Beginning!"),
|
||||||
vertical_space(1200),
|
vertical_space().height(1200),
|
||||||
text("Vertical - Middle!"),
|
text("Vertical - Middle!"),
|
||||||
vertical_space(1200),
|
vertical_space().height(1200),
|
||||||
text("Vertical - End!"),
|
text("Vertical - End!"),
|
||||||
scroll_to_beginning_button(),
|
scroll_to_beginning_button(),
|
||||||
vertical_space(40),
|
vertical_space().height(40),
|
||||||
]
|
]
|
||||||
.spacing(40),
|
.spacing(40),
|
||||||
horizontal_space(1200),
|
horizontal_space().width(1200),
|
||||||
text("Horizontal - End!"),
|
text("Horizontal - End!"),
|
||||||
scroll_to_beginning_button(),
|
scroll_to_beginning_button(),
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -76,7 +76,7 @@ impl Sandbox for Styling {
|
||||||
|
|
||||||
let scrollable = scrollable(column![
|
let scrollable = scrollable(column![
|
||||||
"Scroll me!",
|
"Scroll me!",
|
||||||
vertical_space(800),
|
vertical_space().height(800),
|
||||||
"You did it!"
|
"You did it!"
|
||||||
])
|
])
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
|
|
|
||||||
|
|
@ -274,7 +274,7 @@ mod toast {
|
||||||
container(
|
container(
|
||||||
row![
|
row![
|
||||||
text(toast.title.as_str()),
|
text(toast.title.as_str()),
|
||||||
horizontal_space(Length::Fill),
|
horizontal_space(),
|
||||||
button("X")
|
button("X")
|
||||||
.on_press((on_close)(index))
|
.on_press((on_close)(index))
|
||||||
.padding(3),
|
.padding(3),
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,7 @@ impl Sandbox for Tour {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
controls = controls.push(horizontal_space(Length::Fill));
|
controls = controls.push(horizontal_space());
|
||||||
|
|
||||||
if steps.can_continue() {
|
if steps.can_continue() {
|
||||||
controls =
|
controls =
|
||||||
|
|
@ -574,14 +574,14 @@ impl<'a> Step {
|
||||||
text("Tip: You can use the scrollbar to scroll down faster!")
|
text("Tip: You can use the scrollbar to scroll down faster!")
|
||||||
.size(16),
|
.size(16),
|
||||||
)
|
)
|
||||||
.push(vertical_space(4096))
|
.push(vertical_space().height(4096))
|
||||||
.push(
|
.push(
|
||||||
text("You are halfway there!")
|
text("You are halfway there!")
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.size(30)
|
.size(30)
|
||||||
.horizontal_alignment(alignment::Horizontal::Center),
|
.horizontal_alignment(alignment::Horizontal::Center),
|
||||||
)
|
)
|
||||||
.push(vertical_space(4096))
|
.push(vertical_space().height(4096))
|
||||||
.push(ferris(300, image::FilterMethod::Linear))
|
.push(ferris(300, image::FilterMethod::Linear))
|
||||||
.push(
|
.push(
|
||||||
text("You made it!")
|
text("You made it!")
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@ impl Sandbox for VectorialText {
|
||||||
column![
|
column![
|
||||||
row![
|
row![
|
||||||
text(label),
|
text(label),
|
||||||
horizontal_space(Length::Fill),
|
horizontal_space(),
|
||||||
text(format!("{:.2}", value))
|
text(format!("{:.2}", value))
|
||||||
],
|
],
|
||||||
slider(range, value, message).step(0.01)
|
slider(range, value, message).step(0.01)
|
||||||
|
|
|
||||||
|
|
@ -81,7 +81,7 @@ impl Application for Example {
|
||||||
let data_row = |label, value, color| {
|
let data_row = |label, value, color| {
|
||||||
row![
|
row![
|
||||||
text(label),
|
text(label),
|
||||||
horizontal_space(Length::Fill),
|
horizontal_space(),
|
||||||
text(value).font(Font::MONOSPACE).size(14).style(color),
|
text(value).font(Font::MONOSPACE).size(14).style(color),
|
||||||
]
|
]
|
||||||
.height(40)
|
.height(40)
|
||||||
|
|
@ -127,21 +127,21 @@ impl Application for Example {
|
||||||
scrollable(
|
scrollable(
|
||||||
column![
|
column![
|
||||||
text("Scroll me!"),
|
text("Scroll me!"),
|
||||||
vertical_space(400),
|
vertical_space().height(400),
|
||||||
container(text("I am the outer container!"))
|
container(text("I am the outer container!"))
|
||||||
.id(OUTER_CONTAINER.clone())
|
.id(OUTER_CONTAINER.clone())
|
||||||
.padding(40)
|
.padding(40)
|
||||||
.style(theme::Container::Box),
|
.style(theme::Container::Box),
|
||||||
vertical_space(400),
|
vertical_space().height(400),
|
||||||
scrollable(
|
scrollable(
|
||||||
column![
|
column![
|
||||||
text("Scroll me!"),
|
text("Scroll me!"),
|
||||||
vertical_space(400),
|
vertical_space().height(400),
|
||||||
container(text("I am the inner container!"))
|
container(text("I am the inner container!"))
|
||||||
.id(INNER_CONTAINER.clone())
|
.id(INNER_CONTAINER.clone())
|
||||||
.padding(40)
|
.padding(40)
|
||||||
.style(theme::Container::Box),
|
.style(theme::Container::Box),
|
||||||
vertical_space(400)
|
vertical_space().height(400),
|
||||||
]
|
]
|
||||||
.padding(20)
|
.padding(20)
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -305,15 +305,15 @@ where
|
||||||
/// Creates a new horizontal [`Space`] with the given [`Length`].
|
/// Creates a new horizontal [`Space`] with the given [`Length`].
|
||||||
///
|
///
|
||||||
/// [`Space`]: crate::Space
|
/// [`Space`]: crate::Space
|
||||||
pub fn horizontal_space(width: impl Into<Length>) -> Space {
|
pub fn horizontal_space() -> Space {
|
||||||
Space::with_width(width)
|
Space::with_width(Length::Fill)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Creates a new vertical [`Space`] with the given [`Length`].
|
/// Creates a new vertical [`Space`] with the given [`Length`].
|
||||||
///
|
///
|
||||||
/// [`Space`]: crate::Space
|
/// [`Space`]: crate::Space
|
||||||
pub fn vertical_space(height: impl Into<Length>) -> Space {
|
pub fn vertical_space() -> Space {
|
||||||
Space::with_height(height)
|
Space::with_height(Length::Fill)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Creates a horizontal [`Rule`] with the given height.
|
/// Creates a horizontal [`Rule`] with the given height.
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@ where
|
||||||
content: RefCell::new(Content {
|
content: RefCell::new(Content {
|
||||||
size: Size::ZERO,
|
size: Size::ZERO,
|
||||||
layout: None,
|
layout: None,
|
||||||
element: Element::new(horizontal_space(0)),
|
element: Element::new(horizontal_space().width(0)),
|
||||||
}),
|
}),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,18 @@ impl Space {
|
||||||
height: height.into(),
|
height: height.into(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Sets the width of the [`Space`].
|
||||||
|
pub fn width(mut self, width: impl Into<Length>) -> Self {
|
||||||
|
self.width = width.into();
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Sets the height of the [`Space`].
|
||||||
|
pub fn height(mut self, height: impl Into<Length>) -> Self {
|
||||||
|
self.height = height.into();
|
||||||
|
self
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> for Space
|
impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> for Space
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue