diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-01-11 00:44:56 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-01-11 00:44:56 +0100 |
| commit | de71776e02495df5dc962fb8b8853f666ab8be4f (patch) | |
| tree | 1f87cc68dc554783c6102f3587377f9956bcddba /native/src/widget/column.rs | |
| parent | e879982cfdf0c6a1c6781a9bc46e0a77839de88f (diff) | |
| parent | 84f1a936db93c16255a07f079c47e351635586f4 (diff) | |
| download | iced-de71776e02495df5dc962fb8b8853f666ab8be4f.tar.gz iced-de71776e02495df5dc962fb8b8853f666ab8be4f.tar.bz2 iced-de71776e02495df5dc962fb8b8853f666ab8be4f.zip | |
Merge branch 'master' into paint-example
Diffstat (limited to 'native/src/widget/column.rs')
| -rw-r--r-- | native/src/widget/column.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/native/src/widget/column.rs b/native/src/widget/column.rs index 4b5d631c..79ec5ab4 100644 --- a/native/src/widget/column.rs +++ b/native/src/widget/column.rs @@ -33,7 +33,7 @@ impl<'a, Message, Renderer> Column<'a, Message, Renderer> { Column { spacing: 0, padding: 0, - width: Length::Fill, + width: Length::Shrink, height: Length::Shrink, max_width: u32::MAX, max_height: u32::MAX, @@ -173,10 +173,11 @@ where fn draw( &self, renderer: &mut Renderer, + defaults: &Renderer::Defaults, layout: Layout<'_>, cursor_position: Point, ) -> Renderer::Output { - renderer.draw(&self.children, layout, cursor_position) + renderer.draw(defaults, &self.children, layout, cursor_position) } fn hash_layout(&self, state: &mut Hasher) { @@ -213,6 +214,7 @@ pub trait Renderer: crate::Renderer + Sized { /// [`Layout`]: ../layout/struct.Layout.html fn draw<Message>( &mut self, + defaults: &Self::Defaults, content: &[Element<'_, Message, Self>], layout: Layout<'_>, cursor_position: Point, |