From f9dd5cbb099bbe44a57b6369be54a442363b7a8d Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 12 Jul 2024 15:11:30 +0200 Subject: Introduce helper methods for alignment for all widgets --- examples/scrollable/src/main.rs | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'examples/scrollable/src') diff --git a/examples/scrollable/src/main.rs b/examples/scrollable/src/main.rs index 067dcd70..bf8fdedf 100644 --- a/examples/scrollable/src/main.rs +++ b/examples/scrollable/src/main.rs @@ -2,7 +2,7 @@ use iced::widget::{ button, column, container, horizontal_space, progress_bar, radio, row, scrollable, slider, text, vertical_space, }; -use iced::{Alignment, Border, Color, Element, Length, Task, Theme}; +use iced::{Border, Color, Element, Length, Task, Theme}; use once_cell::sync::Lazy; @@ -24,7 +24,7 @@ struct ScrollableDemo { scrollbar_margin: u16, scroller_width: u16, current_scroll_offset: scrollable::RelativeOffset, - alignment: scrollable::Alignment, + anchor: scrollable::Anchor, } #[derive(Debug, Clone, Eq, PartialEq, Copy)] @@ -37,7 +37,7 @@ enum Direction { #[derive(Debug, Clone)] enum Message { SwitchDirection(Direction), - AlignmentChanged(scrollable::Alignment), + AlignmentChanged(scrollable::Anchor), ScrollbarWidthChanged(u16), ScrollbarMarginChanged(u16), ScrollerWidthChanged(u16), @@ -54,7 +54,7 @@ impl ScrollableDemo { scrollbar_margin: 0, scroller_width: 10, current_scroll_offset: scrollable::RelativeOffset::START, - alignment: scrollable::Alignment::Start, + anchor: scrollable::Anchor::Start, } } @@ -71,7 +71,7 @@ impl ScrollableDemo { } Message::AlignmentChanged(alignment) => { self.current_scroll_offset = scrollable::RelativeOffset::START; - self.alignment = alignment; + self.anchor = alignment; scrollable::snap_to( SCROLLABLE_ID.clone(), @@ -168,14 +168,14 @@ impl ScrollableDemo { text("Scrollable alignment:"), radio( "Start", - scrollable::Alignment::Start, - Some(self.alignment), + scrollable::Anchor::Start, + Some(self.anchor), Message::AlignmentChanged, ), radio( "End", - scrollable::Alignment::End, - Some(self.alignment), + scrollable::Anchor::End, + Some(self.anchor), Message::AlignmentChanged, ) ] @@ -212,7 +212,7 @@ impl ScrollableDemo { text("End!"), scroll_to_beginning_button(), ] - .align_items(Alignment::Center) + .center_x() .padding([40, 0, 40, 0]) .spacing(40), ) @@ -221,7 +221,7 @@ impl ScrollableDemo { .width(self.scrollbar_width) .margin(self.scrollbar_margin) .scroller_width(self.scroller_width) - .alignment(self.alignment), + .anchor(self.anchor), )) .width(Length::Fill) .height(Length::Fill) @@ -238,7 +238,7 @@ impl ScrollableDemo { scroll_to_beginning_button(), ] .height(450) - .align_items(Alignment::Center) + .center_y() .padding([0, 40, 0, 40]) .spacing(40), ) @@ -247,7 +247,7 @@ impl ScrollableDemo { .width(self.scrollbar_width) .margin(self.scrollbar_margin) .scroller_width(self.scroller_width) - .alignment(self.alignment), + .anchor(self.anchor), )) .width(Length::Fill) .height(Length::Fill) @@ -280,7 +280,7 @@ impl ScrollableDemo { text("Horizontal - End!"), scroll_to_beginning_button(), ] - .align_items(Alignment::Center) + .center_y() .padding([0, 40, 0, 40]) .spacing(40), ) @@ -289,7 +289,7 @@ impl ScrollableDemo { .width(self.scrollbar_width) .margin(self.scrollbar_margin) .scroller_width(self.scroller_width) - .alignment(self.alignment); + .anchor(self.anchor); scrollable::Direction::Both { horizontal: scrollbar, @@ -322,7 +322,7 @@ impl ScrollableDemo { let content: Element = column![scroll_controls, scrollable_content, progress_bars] - .align_items(Alignment::Center) + .center_x() .spacing(10) .into(); -- cgit From 76737351ea9e116291112b7d576d9ed4f6bb5c2a Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 12 Jul 2024 18:12:34 +0200 Subject: Re-export variants of `Length` and `alignment` types --- examples/scrollable/src/main.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'examples/scrollable/src') diff --git a/examples/scrollable/src/main.rs b/examples/scrollable/src/main.rs index bf8fdedf..a1c23976 100644 --- a/examples/scrollable/src/main.rs +++ b/examples/scrollable/src/main.rs @@ -2,7 +2,7 @@ use iced::widget::{ button, column, container, horizontal_space, progress_bar, radio, row, scrollable, slider, text, vertical_space, }; -use iced::{Border, Color, Element, Length, Task, Theme}; +use iced::{Border, Center, Color, Element, Fill, Task, Theme}; use once_cell::sync::Lazy; @@ -212,7 +212,7 @@ impl ScrollableDemo { text("End!"), scroll_to_beginning_button(), ] - .center_x() + .align_x(Center) .padding([40, 0, 40, 0]) .spacing(40), ) @@ -223,8 +223,8 @@ impl ScrollableDemo { .scroller_width(self.scroller_width) .anchor(self.anchor), )) - .width(Length::Fill) - .height(Length::Fill) + .width(Fill) + .height(Fill) .id(SCROLLABLE_ID.clone()) .on_scroll(Message::Scrolled), Direction::Horizontal => scrollable( @@ -238,7 +238,7 @@ impl ScrollableDemo { scroll_to_beginning_button(), ] .height(450) - .center_y() + .align_y(Center) .padding([0, 40, 0, 40]) .spacing(40), ) @@ -249,8 +249,8 @@ impl ScrollableDemo { .scroller_width(self.scroller_width) .anchor(self.anchor), )) - .width(Length::Fill) - .height(Length::Fill) + .width(Fill) + .height(Fill) .id(SCROLLABLE_ID.clone()) .on_scroll(Message::Scrolled), Direction::Multi => scrollable( @@ -280,7 +280,7 @@ impl ScrollableDemo { text("Horizontal - End!"), scroll_to_beginning_button(), ] - .center_y() + .align_y(Center) .padding([0, 40, 0, 40]) .spacing(40), ) @@ -296,8 +296,8 @@ impl ScrollableDemo { vertical: scrollbar, } }) - .width(Length::Fill) - .height(Length::Fill) + .width(Fill) + .height(Fill) .id(SCROLLABLE_ID.clone()) .on_scroll(Message::Scrolled), }); @@ -322,7 +322,7 @@ impl ScrollableDemo { let content: Element = column![scroll_controls, scrollable_content, progress_bars] - .center_x() + .align_x(Center) .spacing(10) .into(); -- cgit From 7c3341760de74df2153ef367e502960f20f9c681 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 12 Jul 2024 18:40:54 +0200 Subject: Improve `Padding` ergonomics We expose free functions for creating a `Padding` and methods with the same name to modify its fields. --- examples/scrollable/src/main.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'examples/scrollable/src') diff --git a/examples/scrollable/src/main.rs b/examples/scrollable/src/main.rs index a1c23976..de4f2f9a 100644 --- a/examples/scrollable/src/main.rs +++ b/examples/scrollable/src/main.rs @@ -213,7 +213,7 @@ impl ScrollableDemo { scroll_to_beginning_button(), ] .align_x(Center) - .padding([40, 0, 40, 0]) + .padding([40, 0]) .spacing(40), ) .direction(scrollable::Direction::Vertical( @@ -239,7 +239,7 @@ impl ScrollableDemo { ] .height(450) .align_y(Center) - .padding([0, 40, 0, 40]) + .padding([0, 40]) .spacing(40), ) .direction(scrollable::Direction::Horizontal( @@ -281,7 +281,7 @@ impl ScrollableDemo { scroll_to_beginning_button(), ] .align_y(Center) - .padding([0, 40, 0, 40]) + .padding([0, 40]) .spacing(40), ) .direction({ -- cgit From 3f480d3d18c41188bf40ead0a3dc4497316f11ae Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 12 Jul 2024 19:57:39 +0200 Subject: Rename `embed_*` in `Scrollable` to simply `spacing` --- examples/scrollable/src/main.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'examples/scrollable/src') diff --git a/examples/scrollable/src/main.rs b/examples/scrollable/src/main.rs index de4f2f9a..969f385e 100644 --- a/examples/scrollable/src/main.rs +++ b/examples/scrollable/src/main.rs @@ -216,13 +216,14 @@ impl ScrollableDemo { .padding([40, 0]) .spacing(40), ) - .direction(scrollable::Direction::Vertical( - scrollable::Scrollbar::new() + .direction(scrollable::Direction::Vertical { + scrollbar: scrollable::Scrollbar::new() .width(self.scrollbar_width) .margin(self.scrollbar_margin) .scroller_width(self.scroller_width) .anchor(self.anchor), - )) + spacing: None, + }) .width(Fill) .height(Fill) .id(SCROLLABLE_ID.clone()) @@ -242,13 +243,14 @@ impl ScrollableDemo { .padding([0, 40]) .spacing(40), ) - .direction(scrollable::Direction::Horizontal( - scrollable::Scrollbar::new() + .direction(scrollable::Direction::Horizontal { + scrollbar: scrollable::Scrollbar::new() .width(self.scrollbar_width) .margin(self.scrollbar_margin) .scroller_width(self.scroller_width) .anchor(self.anchor), - )) + spacing: None, + }) .width(Fill) .height(Fill) .id(SCROLLABLE_ID.clone()) -- cgit