diff --git a/devtools/src/lib.rs b/devtools/src/lib.rs index d548b55a..c28bf31a 100644 --- a/devtools/src/lib.rs +++ b/devtools/src/lib.rs @@ -23,8 +23,8 @@ use crate::program::message; use crate::runtime::task::{self, Task}; use crate::time_machine::TimeMachine; use crate::widget::{ - bottom_right, button, center, column, container, horizontal_space, opaque, - row, scrollable, stack, text, themer, + bottom_right, button, center, column, container, opaque, row, scrollable, + space_x, stack, text, themer, }; use std::fmt; @@ -448,7 +448,7 @@ where .width(100) .on_press(Message::CancelSetup) .style(button::danger), - horizontal_space(), + space_x(), button( text(match goal { Goal::Installation => "Install", @@ -498,13 +498,13 @@ where let comparison = column![ row![ "Installed revision:", - horizontal_space(), + space_x(), inline_code(revision.as_deref().unwrap_or("Unknown")) ] .align_y(Center), row![ "Compatible revision:", - horizontal_space(), + space_x(), inline_code(comet::COMPATIBLE_REVISION), ] .align_y(Center) diff --git a/examples/bezier_tool/src/main.rs b/examples/bezier_tool/src/main.rs index 9a525210..0f006821 100644 --- a/examples/bezier_tool/src/main.rs +++ b/examples/bezier_tool/src/main.rs @@ -1,5 +1,5 @@ //! This example showcases an interactive `Canvas` for drawing Bézier curves. -use iced::widget::{button, container, horizontal_space, hover, right}; +use iced::widget::{button, container, hover, right, space_x}; use iced::{Element, Theme}; pub fn main() -> iced::Result { @@ -38,7 +38,7 @@ impl Example { container(hover( self.bezier.view(&self.curves).map(Message::AddCurve), if self.curves.is_empty() { - container(horizontal_space()) + container(space_x()) } else { right( button("Clear") diff --git a/examples/combo_box/src/main.rs b/examples/combo_box/src/main.rs index a7a68590..cc0e7fc0 100644 --- a/examples/combo_box/src/main.rs +++ b/examples/combo_box/src/main.rs @@ -1,6 +1,4 @@ -use iced::widget::{ - center, column, combo_box, scrollable, text, vertical_space, -}; +use iced::widget::{center, column, combo_box, scrollable, space_y, text}; use iced::{Center, Element, Fill}; pub fn main() -> iced::Result { @@ -62,7 +60,7 @@ impl Example { text(&self.text), "What is your language?", combo_box, - vertical_space().height(150), + space_y().height(150), ] .width(Fill) .align_x(Center) diff --git a/examples/editor/src/main.rs b/examples/editor/src/main.rs index a687eee4..6a987030 100644 --- a/examples/editor/src/main.rs +++ b/examples/editor/src/main.rs @@ -1,8 +1,8 @@ use iced::highlighter; use iced::keyboard; use iced::widget::{ - button, center_x, column, container, horizontal_space, operation, - pick_list, row, text, text_editor, toggler, tooltip, + button, center_x, column, container, operation, pick_list, row, space_x, + text, text_editor, toggler, tooltip, }; use iced::{Center, Element, Fill, Font, Task, Theme}; @@ -157,7 +157,7 @@ impl Editor { "Save file", self.is_dirty.then_some(Message::SaveFile) ), - horizontal_space(), + space_x(), toggler(self.word_wrap) .label("Word Wrap") .on_toggle(Message::WordWrapToggled), @@ -184,7 +184,7 @@ impl Editor { } else { String::from("New file") }), - horizontal_space(), + space_x(), text({ let (line, column) = self.content.cursor_position(); diff --git a/examples/gallery/src/main.rs b/examples/gallery/src/main.rs index 14d20103..529c04d4 100644 --- a/examples/gallery/src/main.rs +++ b/examples/gallery/src/main.rs @@ -9,8 +9,8 @@ use crate::civitai::{Error, Id, Image, Rgba, Size}; use iced::animation; use iced::time::{Instant, milliseconds}; use iced::widget::{ - button, container, float, grid, horizontal_space, image, mouse_area, - opaque, scrollable, sensor, stack, + button, container, float, grid, image, mouse_area, opaque, scrollable, + sensor, space_x, stack, }; use iced::window; use iced::{ @@ -227,7 +227,7 @@ fn card<'a>( }) .into() } else { - horizontal_space().into() + space_x().into() }; if let Some(blurhash) = preview.blurhash(now) { @@ -241,7 +241,7 @@ fn card<'a>( thumbnail } } else { - horizontal_space().into() + space_x().into() }; let card = mouse_area(container(image).style(container::dark)) @@ -264,7 +264,7 @@ fn card<'a>( } fn placeholder<'a>() -> Element<'a, Message> { - container(horizontal_space()).style(container::dark).into() + container(space_x()).style(container::dark).into() } enum Preview { @@ -426,7 +426,7 @@ impl Viewer { .scale(self.image_fade_in.interpolate(1.5, 1.0, now)) .into() } else { - horizontal_space().into() + space_x().into() }; if opacity > 0.0 { @@ -443,7 +443,7 @@ impl Viewer { .on_press(Message::Close), ) } else { - horizontal_space().into() + space_x().into() } } } diff --git a/examples/gradient/src/main.rs b/examples/gradient/src/main.rs index 8c0c90d3..d927cd23 100644 --- a/examples/gradient/src/main.rs +++ b/examples/gradient/src/main.rs @@ -1,8 +1,6 @@ use iced::gradient; use iced::theme; -use iced::widget::{ - checkbox, column, container, horizontal_space, row, slider, text, -}; +use iced::widget::{checkbox, column, container, row, slider, space_x, text}; use iced::{Center, Color, Element, Fill, Radians, Theme, color}; pub fn main() -> iced::Result { @@ -59,7 +57,7 @@ impl Gradient { transparent, } = *self; - let gradient_box = container(horizontal_space()) + let gradient_box = container(space_x()) .style(move |_theme| { let gradient = gradient::Linear::new(angle) .add_stop(0.0, start) diff --git a/examples/layout/src/main.rs b/examples/layout/src/main.rs index a43bb117..dc311d75 100644 --- a/examples/layout/src/main.rs +++ b/examples/layout/src/main.rs @@ -2,8 +2,8 @@ use iced::border; use iced::keyboard; use iced::mouse; use iced::widget::{ - button, canvas, center, center_y, checkbox, column, container, - horizontal_space, pick_list, pin, row, rule, scrollable, stack, text, + button, canvas, center, center_y, checkbox, column, container, pick_list, + pin, row, rule, scrollable, space_x, stack, text, }; use iced::{ Center, Element, Fill, Font, Length, Point, Rectangle, Renderer, Shrink, @@ -70,7 +70,7 @@ impl Layout { fn view(&self) -> Element<'_, Message> { let header = row![ text(self.example.title).size(20).font(Font::MONOSPACE), - horizontal_space(), + space_x(), checkbox("Explain", self.explain) .on_toggle(Message::ExplainToggled), pick_list(Theme::ALL, self.theme.as_ref(), Message::ThemeSelected) @@ -99,7 +99,7 @@ impl Layout { .on_press(Message::Previous) .into(), ), - Some(horizontal_space().into()), + Some(space_x().into()), (!self.example.is_last()).then_some( button(text("Next →")) .padding([5, 10]) @@ -238,20 +238,14 @@ fn row_<'a>() -> Element<'a, Message> { } fn space<'a>() -> Element<'a, Message> { - row!["Left!", horizontal_space(), "Right!"].into() + row!["Left!", space_x(), "Right!"].into() } fn application<'a>() -> Element<'a, Message> { let header = container( - row![ - square(40), - horizontal_space(), - "Header!", - horizontal_space(), - square(40), - ] - .padding(10) - .align_y(Center), + row![square(40), space_x(), "Header!", space_x(), square(40),] + .padding(10) + .align_y(Center), ) .style(|theme| { let palette = theme.extended_palette(); diff --git a/examples/lazy/src/main.rs b/examples/lazy/src/main.rs index 585b8c0a..99348da7 100644 --- a/examples/lazy/src/main.rs +++ b/examples/lazy/src/main.rs @@ -1,6 +1,5 @@ use iced::widget::{ - button, column, horizontal_space, lazy, pick_list, row, scrollable, text, - text_input, + button, column, lazy, pick_list, row, scrollable, space_x, text, text_input, }; use iced::{Element, Fill}; @@ -174,7 +173,7 @@ impl App { row![ text(item.name.clone()).color(item.color), - horizontal_space(), + space_x(), pick_list(Color::ALL, Some(item.color), move |color| { Message::ItemColorChanged(item.clone(), color) }), diff --git a/examples/markdown/src/main.rs b/examples/markdown/src/main.rs index 42302b9e..c6df9a0c 100644 --- a/examples/markdown/src/main.rs +++ b/examples/markdown/src/main.rs @@ -5,8 +5,8 @@ use iced::clipboard; use iced::highlighter; use iced::time::{self, Instant, milliseconds}; use iced::widget::{ - button, center_x, container, horizontal_space, hover, image, markdown, - operation, right, row, scrollable, sensor, text_editor, toggler, + button, center_x, container, hover, image, markdown, operation, right, row, + scrollable, sensor, space_x, text_editor, toggler, }; use iced::window; use iced::{ @@ -264,7 +264,7 @@ impl<'a> markdown::Viewer<'a, Message> for CustomViewer<'a> { ) .into() } else { - sensor(horizontal_space()) + sensor(space_x()) .key_ref(url.as_str()) .delay(milliseconds(500)) .on_show(|_size| Message::ImageShown(url.clone())) diff --git a/examples/modal/src/main.rs b/examples/modal/src/main.rs index 54fcb1af..82596130 100644 --- a/examples/modal/src/main.rs +++ b/examples/modal/src/main.rs @@ -2,8 +2,8 @@ use iced::event::{self, Event}; use iced::keyboard; use iced::keyboard::key; use iced::widget::{ - button, center, column, container, horizontal_space, mouse_area, opaque, - operation, pick_list, row, stack, text, text_input, + button, center, column, container, mouse_area, opaque, operation, + pick_list, row, space_x, stack, text, text_input, }; use iced::{Bottom, Color, Element, Fill, Subscription, Task}; @@ -95,16 +95,12 @@ impl App { fn view(&self) -> Element<'_, Message> { let content = container( column![ - row![text("Top Left"), horizontal_space(), text("Top Right")] + row![text("Top Left"), space_x(), text("Top Right")] .height(Fill), center(button(text("Show Modal")).on_press(Message::ShowModal)), - row![ - text("Bottom Left"), - horizontal_space(), - text("Bottom Right") - ] - .align_y(Bottom) - .height(Fill), + row![text("Bottom Left"), space_x(), text("Bottom Right")] + .align_y(Bottom) + .height(Fill), ] .height(Fill), ) diff --git a/examples/multi_window/src/main.rs b/examples/multi_window/src/main.rs index a6731023..a8076617 100644 --- a/examples/multi_window/src/main.rs +++ b/examples/multi_window/src/main.rs @@ -1,6 +1,6 @@ use iced::widget::{ - button, center, center_x, column, container, horizontal_space, operation, - scrollable, text, text_input, + button, center, center_x, column, container, operation, scrollable, + space_x, text, text_input, }; use iced::window; use iced::{ @@ -134,7 +134,7 @@ impl Example { if let Some(window) = self.windows.get(&window_id) { center(window.view(window_id)).into() } else { - horizontal_space().into() + space_x().into() } } diff --git a/examples/pick_list/src/main.rs b/examples/pick_list/src/main.rs index 1023a30a..a1e44ae8 100644 --- a/examples/pick_list/src/main.rs +++ b/examples/pick_list/src/main.rs @@ -1,4 +1,4 @@ -use iced::widget::{column, pick_list, scrollable, vertical_space}; +use iced::widget::{column, pick_list, scrollable, space_y}; use iced::{Center, Element, Fill}; pub fn main() -> iced::Result { @@ -33,10 +33,10 @@ impl Example { .placeholder("Choose a language..."); let content = column![ - vertical_space().height(600), + space_y().height(600), "Which is your favorite language?", pick_list, - vertical_space().height(600), + space_y().height(600), ] .width(Fill) .align_x(Center) diff --git a/examples/scrollable/src/main.rs b/examples/scrollable/src/main.rs index e354bac8..9c6bfa1c 100644 --- a/examples/scrollable/src/main.rs +++ b/examples/scrollable/src/main.rs @@ -1,6 +1,6 @@ use iced::widget::{ - button, column, container, horizontal_space, operation, progress_bar, - radio, row, scrollable, slider, text, vertical_space, + button, column, container, operation, progress_bar, radio, row, scrollable, + slider, space_x, space_y, text, }; use iced::{Border, Center, Color, Element, Fill, Task, Theme}; @@ -190,9 +190,9 @@ impl ScrollableDemo { column![ scroll_to_end_button(), text("Beginning!"), - vertical_space().height(1200), + space_y().height(1200), text("Middle!"), - vertical_space().height(1200), + space_y().height(1200), text("End!"), scroll_to_beginning_button(), ] @@ -215,9 +215,9 @@ impl ScrollableDemo { row![ scroll_to_end_button(), text("Beginning!"), - horizontal_space().width(1200), + space_x().width(1200), text("Middle!"), - horizontal_space().width(1200), + space_x().width(1200), text("End!"), scroll_to_beginning_button(), ] @@ -242,25 +242,25 @@ impl ScrollableDemo { row![ column![ text("Let's do some scrolling!"), - vertical_space().height(2400) + space_y().height(2400) ], scroll_to_end_button(), text("Horizontal - Beginning!"), - horizontal_space().width(1200), + space_x().width(1200), //vertical content column![ text("Horizontal - Middle!"), scroll_to_end_button(), text("Vertical - Beginning!"), - vertical_space().height(1200), + space_y().height(1200), text("Vertical - Middle!"), - vertical_space().height(1200), + space_y().height(1200), text("Vertical - End!"), scroll_to_beginning_button(), - vertical_space().height(40), + space_y().height(40), ] .spacing(40), - horizontal_space().width(1200), + space_x().width(1200), text("Horizontal - End!"), scroll_to_beginning_button(), ] diff --git a/examples/styling/src/main.rs b/examples/styling/src/main.rs index 3e48c5fe..996f80ce 100644 --- a/examples/styling/src/main.rs +++ b/examples/styling/src/main.rs @@ -1,8 +1,8 @@ use iced::keyboard; use iced::widget::{ button, center_x, center_y, checkbox, column, container, pick_list, - progress_bar, row, rule, scrollable, slider, text, text_input, toggler, - vertical_space, + progress_bar, row, rule, scrollable, slider, space_y, text, text_input, + toggler, }; use iced::{Center, Element, Fill, Shrink, Subscription, Theme}; @@ -127,7 +127,7 @@ impl Styling { let scroll_me = scrollable(column![ "Scroll me!", - vertical_space().height(800), + space_y().height(800), "You did it!" ]) .width(Fill) diff --git a/examples/toast/src/main.rs b/examples/toast/src/main.rs index db4e073b..8f91c9a5 100644 --- a/examples/toast/src/main.rs +++ b/examples/toast/src/main.rs @@ -171,9 +171,7 @@ mod toast { use iced::mouse; use iced::theme; use iced::time::{self, Duration, Instant}; - use iced::widget::{ - button, column, container, horizontal_space, row, rule, text, - }; + use iced::widget::{button, column, container, row, rule, space_x, text}; use iced::window; use iced::{ Alignment, Center, Element, Event, Fill, Length, Point, Rectangle, @@ -239,7 +237,7 @@ mod toast { container( row![ text(toast.title.as_str()), - horizontal_space(), + space_x(), button("X") .on_press((on_close)(index)) .padding(3), diff --git a/examples/tour/src/main.rs b/examples/tour/src/main.rs index 78c329b5..33ae3cca 100644 --- a/examples/tour/src/main.rs +++ b/examples/tour/src/main.rs @@ -1,8 +1,7 @@ use iced::widget::{Button, Column, Container, Slider}; use iced::widget::{ - button, center_x, center_y, checkbox, column, horizontal_space, image, - radio, rich_text, row, scrollable, slider, span, text, text_input, toggler, - vertical_space, + button, center_x, center_y, checkbox, column, image, radio, rich_text, row, + scrollable, slider, space_x, space_y, span, text, text_input, toggler, }; use iced::{Center, Color, Element, Fill, Font, Pixels, color}; @@ -147,7 +146,7 @@ impl Tour { .on_press(Message::BackPressed) .style(button::secondary) }), - horizontal_space(), + space_x(), self.can_continue().then(|| { padded_button("Next").on_press(Message::NextPressed) }) @@ -406,14 +405,14 @@ impl Tour { text("Tip: You can use the scrollbar to scroll down faster!") .size(16), ) - .push(vertical_space().height(4096)) + .push(space_y().height(4096)) .push( text("You are halfway there!") .width(Fill) .size(30) .align_x(Center), ) - .push(vertical_space().height(4096)) + .push(space_y().height(4096)) .push(ferris(300, image::FilterMethod::Linear)) .push(text("You made it!").width(Fill).size(50).align_x(Center)) } diff --git a/examples/vectorial_text/src/main.rs b/examples/vectorial_text/src/main.rs index 78349696..12d190a3 100644 --- a/examples/vectorial_text/src/main.rs +++ b/examples/vectorial_text/src/main.rs @@ -1,8 +1,6 @@ use iced::alignment; use iced::mouse; -use iced::widget::{ - canvas, checkbox, column, horizontal_space, row, slider, text, -}; +use iced::widget::{canvas, checkbox, column, row, slider, space_x, text}; use iced::{Center, Element, Fill, Point, Rectangle, Renderer, Theme, Vector}; pub fn main() -> iced::Result { @@ -51,7 +49,7 @@ impl VectorialText { fn view(&self) -> Element<'_, Message> { let slider_with_label = |label, range, value, message: fn(f32) -> _| { column![ - row![text(label), horizontal_space(), text!("{:.2}", value)], + row![text(label), space_x(), text!("{:.2}", value)], slider(range, value, message).step(0.01) ] .spacing(2) diff --git a/examples/visible_bounds/src/main.rs b/examples/visible_bounds/src/main.rs index 893337e4..7a20ba86 100644 --- a/examples/visible_bounds/src/main.rs +++ b/examples/visible_bounds/src/main.rs @@ -1,8 +1,7 @@ use iced::event::{self, Event}; use iced::mouse; use iced::widget::{ - column, container, horizontal_space, row, scrollable, selector, text, - vertical_space, + column, container, row, scrollable, selector, space_x, space_y, text, }; use iced::window; use iced::{ @@ -64,7 +63,7 @@ impl Example { let data_row = |label, value, color| { row![ text(label), - horizontal_space(), + space_x(), text(value) .font(Font::MONOSPACE) .size(14) @@ -112,21 +111,21 @@ impl Example { scrollable( column![ text("Scroll me!"), - vertical_space().height(400), + space_y().height(400), container(text("I am the outer container!")) .id(OUTER_CONTAINER) .padding(40) .style(container::rounded_box), - vertical_space().height(400), + space_y().height(400), scrollable( column![ text("Scroll me!"), - vertical_space().height(400), + space_y().height(400), container(text("I am the inner container!")) .id(INNER_CONTAINER) .padding(40) .style(container::rounded_box), - vertical_space().height(400), + space_y().height(400), ] .padding(20) ) diff --git a/tester/src/lib.rs b/tester/src/lib.rs index 4021d8c2..5c2965cb 100644 --- a/tester/src/lib.rs +++ b/tester/src/lib.rs @@ -27,8 +27,8 @@ use crate::test::ice; use crate::test::instruction; use crate::test::{Emulator, Ice, Instruction}; use crate::widget::{ - button, center, column, combo_box, container, horizontal_space, pick_list, - row, rule, scrollable, text, text_editor, text_input, themer, + button, center, column, combo_box, container, pick_list, row, rule, + scrollable, space_x, text, text_editor, text_input, themer, }; /// Attaches a [`Tester`] to the given [`Program`]. @@ -566,7 +566,7 @@ impl Tester

{ let viewport = container( scrollable( container(match &self.state { - State::Empty => Element::from(horizontal_space()), + State::Empty => Element::from(space_x()), State::Idle { state } => { let theme = program.theme(state, window); @@ -797,7 +797,7 @@ impl Tester

{ }; let edit = if self.is_busy() { - Element::from(horizontal_space()) + Element::from(space_x()) } else if self.edit.is_none() { button(icon::pencil().size(14)) .padding(0) @@ -851,7 +851,7 @@ where column![ row![ text(fragment).size(14).font(Font::MONOSPACE), - horizontal_space(), + space_x(), control.into() ] .spacing(5) diff --git a/widget/src/helpers.rs b/widget/src/helpers.rs index 89aa7231..a5d20222 100644 --- a/widget/src/helpers.rs +++ b/widget/src/helpers.rs @@ -1017,7 +1017,7 @@ where /// # mod iced { pub mod widget { pub use iced_widget::*; } } /// # pub type State = (); /// # pub type Element<'a, Message> = iced_widget::core::Element<'a, Message, iced_widget::Theme, iced_widget::Renderer>; -/// use iced::widget::{column, scrollable, vertical_space}; +/// use iced::widget::{column, scrollable, space_y}; /// /// enum Message { /// // ... @@ -1026,7 +1026,7 @@ where /// fn view(state: &State) -> Element<'_, Message> { /// scrollable(column![ /// "Scroll me!", -/// vertical_space().height(3000), +/// space_y().height(3000), /// "You did it!", /// ]).into() /// } @@ -1733,7 +1733,7 @@ where /// horizontal space. /// /// This can be useful to separate widgets in a [`Row`]. -pub fn horizontal_space() -> Space { +pub fn space_x() -> Space { Space::with_width(Length::Fill) } @@ -1741,7 +1741,7 @@ pub fn horizontal_space() -> Space { /// vertical space. /// /// This can be useful to separate widgets in a [`Column`]. -pub fn vertical_space() -> Space { +pub fn space_y() -> Space { Space::with_height(Length::Fill) } diff --git a/widget/src/responsive.rs b/widget/src/responsive.rs index a987a430..814f8909 100644 --- a/widget/src/responsive.rs +++ b/widget/src/responsive.rs @@ -8,7 +8,7 @@ use crate::core::{ self, Clipboard, Element, Event, Length, Rectangle, Shell, Size, Vector, Widget, }; -use crate::horizontal_space; +use crate::space_x; /// A widget that is aware of its dimensions. /// @@ -44,7 +44,7 @@ where view: Box::new(view), width: Length::Fill, height: Length::Fill, - content: Element::new(horizontal_space().width(0)), + content: Element::new(space_x().width(0)), } } diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs index 5320a9cc..321aeb25 100644 --- a/widget/src/scrollable.rs +++ b/widget/src/scrollable.rs @@ -5,7 +5,7 @@ //! # mod iced { pub mod widget { pub use iced_widget::*; } } //! # pub type State = (); //! # pub type Element<'a, Message> = iced_widget::core::Element<'a, Message, iced_widget::Theme, iced_widget::Renderer>; -//! use iced::widget::{column, scrollable, vertical_space}; +//! use iced::widget::{column, scrollable, space_y}; //! //! enum Message { //! // ... @@ -14,7 +14,7 @@ //! fn view(state: &State) -> Element<'_, Message> { //! scrollable(column![ //! "Scroll me!", -//! vertical_space().height(3000), +//! space_y().height(3000), //! "You did it!", //! ]).into() //! } @@ -48,7 +48,7 @@ pub use operation::scrollable::{AbsoluteOffset, RelativeOffset}; /// # mod iced { pub mod widget { pub use iced_widget::*; } } /// # pub type State = (); /// # pub type Element<'a, Message> = iced_widget::core::Element<'a, Message, iced_widget::Theme, iced_widget::Renderer>; -/// use iced::widget::{column, scrollable, vertical_space}; +/// use iced::widget::{column, scrollable, space_y}; /// /// enum Message { /// // ... @@ -57,7 +57,7 @@ pub use operation::scrollable::{AbsoluteOffset, RelativeOffset}; /// fn view(state: &State) -> Element<'_, Message> { /// scrollable(column![ /// "Scroll me!", -/// vertical_space().height(3000), +/// space_y().height(3000), /// "You did it!", /// ]).into() /// }