diff options
| -rw-r--r-- | examples/pure/todos/src/main.rs | 10 | ||||
| -rw-r--r-- | pure/src/widget/column.rs | 15 |
2 files changed, 23 insertions, 2 deletions
diff --git a/examples/pure/todos/src/main.rs b/examples/pure/todos/src/main.rs index 9acc9fcc..e993c598 100644 --- a/examples/pure/todos/src/main.rs +++ b/examples/pure/todos/src/main.rs @@ -3,11 +3,18 @@ use iced::pure::widget::{ button, checkbox, column, container, row, scrollable, text, text_input, }; use iced::pure::{Application, Element, Text}; +use iced::window; use iced::{Command, Font, Length, Settings}; use serde::{Deserialize, Serialize}; pub fn main() -> iced::Result { - Todos::run(Settings::default()) + Todos::run(Settings { + window: window::Settings { + size: (500, 800), + ..window::Settings::default() + }, + ..Settings::default() + }) } #[derive(Debug)] @@ -184,6 +191,7 @@ impl Application for Todos { let content = column() .spacing(20) + .max_width(800) .push(title) .push(input) .push(controls) diff --git a/pure/src/widget/column.rs b/pure/src/widget/column.rs index 68d3c4b4..a9d7246e 100644 --- a/pure/src/widget/column.rs +++ b/pure/src/widget/column.rs @@ -10,12 +10,14 @@ use iced_native::{ }; use std::any::{self, Any}; +use std::u32; pub struct Column<'a, Message, Renderer> { spacing: u16, padding: Padding, width: Length, height: Length, + max_width: u32, align_items: Alignment, children: Vec<Element<'a, Message, Renderer>>, } @@ -33,6 +35,7 @@ impl<'a, Message, Renderer> Column<'a, Message, Renderer> { padding: Padding::ZERO, width: Length::Shrink, height: Length::Shrink, + max_width: u32::MAX, align_items: Alignment::Start, children, } @@ -58,6 +61,12 @@ impl<'a, Message, Renderer> Column<'a, Message, Renderer> { self } + /// Sets the maximum width of the [`Column`]. + pub fn max_width(mut self, max_width: u32) -> Self { + self.max_width = max_width; + self + } + pub fn align_items(mut self, align: Alignment) -> Self { self.align_items = align; self @@ -106,7 +115,10 @@ where renderer: &Renderer, limits: &layout::Limits, ) -> layout::Node { - let limits = limits.width(self.width).height(self.height); + let limits = limits + .max_width(self.max_width) + .width(self.width) + .height(self.height); flex::resolve( flex::Axis::Vertical, @@ -204,6 +216,7 @@ where self.tag().hash(state); self.width.hash(state); self.height.hash(state); + self.max_width.hash(state); self.align_items.hash(state); self.spacing.hash(state); self.padding.hash(state); |