From 65eb218d3d7ba52b2869a586a1480eeb3c8f84e4 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 21 Nov 2019 13:47:20 +0100
Subject: Move widgets from `core` to `native` and `web`

Also made fields private and improved `Renderer` traits.
---
 native/src/widget/container.rs | 92 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 88 insertions(+), 4 deletions(-)

(limited to 'native/src/widget/container.rs')

diff --git a/native/src/widget/container.rs b/native/src/widget/container.rs
index fd7a5ca5..54117eb1 100644
--- a/native/src/widget/container.rs
+++ b/native/src/widget/container.rs
@@ -1,10 +1,94 @@
 use std::hash::Hash;
 
-use crate::{layout, Element, Event, Hasher, Layout, Length, Point, Widget};
+use crate::{
+    layout, Align, Element, Event, Hasher, Layout, Length, Point, Widget,
+};
 
-/// A container that distributes its contents vertically.
-pub type Container<'a, Message, Renderer> =
-    iced_core::Container<Element<'a, Message, Renderer>>;
+use std::u32;
+
+/// An element decorating some content.
+///
+/// It is normally used for alignment purposes.
+#[allow(missing_docs)]
+pub struct Container<'a, Message, Renderer> {
+    width: Length,
+    height: Length,
+    max_width: u32,
+    max_height: u32,
+    horizontal_alignment: Align,
+    vertical_alignment: Align,
+    content: Element<'a, Message, Renderer>,
+}
+
+impl<'a, Message, Renderer> Container<'a, Message, Renderer> {
+    /// Creates an empty [`Container`].
+    ///
+    /// [`Container`]: struct.Container.html
+    pub fn new<T>(content: T) -> Self
+    where
+        T: Into<Element<'a, Message, Renderer>>,
+    {
+        Container {
+            width: Length::Shrink,
+            height: Length::Shrink,
+            max_width: u32::MAX,
+            max_height: u32::MAX,
+            horizontal_alignment: Align::Start,
+            vertical_alignment: Align::Start,
+            content: content.into(),
+        }
+    }
+
+    /// Sets the width of the [`Container`].
+    ///
+    /// [`Container`]: struct.Container.html
+    pub fn width(mut self, width: Length) -> Self {
+        self.width = width;
+        self
+    }
+
+    /// Sets the height of the [`Container`].
+    ///
+    /// [`Container`]: struct.Container.html
+    pub fn height(mut self, height: Length) -> Self {
+        self.height = height;
+        self
+    }
+
+    /// Sets the maximum width of the [`Container`].
+    ///
+    /// [`Container`]: struct.Container.html
+    pub fn max_width(mut self, max_width: u32) -> Self {
+        self.max_width = max_width;
+        self
+    }
+
+    /// Sets the maximum height of the [`Container`] in pixels.
+    ///
+    /// [`Container`]: struct.Container.html
+    pub fn max_height(mut self, max_height: u32) -> Self {
+        self.max_height = max_height;
+        self
+    }
+
+    /// Centers the contents in the horizontal axis of the [`Container`].
+    ///
+    /// [`Container`]: struct.Container.html
+    pub fn center_x(mut self) -> Self {
+        self.horizontal_alignment = Align::Center;
+
+        self
+    }
+
+    /// Centers the contents in the vertical axis of the [`Container`].
+    ///
+    /// [`Container`]: struct.Container.html
+    pub fn center_y(mut self) -> Self {
+        self.vertical_alignment = Align::Center;
+
+        self
+    }
+}
 
 impl<'a, Message, Renderer> Widget<Message, Renderer>
     for Container<'a, Message, Renderer>
-- 
cgit 


From a7dba612f03e58d7bd9527499d893987986b347c Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 22 Nov 2019 19:36:57 +0100
Subject: Write docs for `iced` and `iced_native`

---
 native/src/widget/container.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'native/src/widget/container.rs')

diff --git a/native/src/widget/container.rs b/native/src/widget/container.rs
index 2f15573d..64a5f4da 100644
--- a/native/src/widget/container.rs
+++ b/native/src/widget/container.rs
@@ -1,3 +1,4 @@
+//! Decorate content and apply alignment.
 use std::hash::Hash;
 
 use crate::{
-- 
cgit 


From d136b7ce648cde0dcdcc5388d8cb82b3e7e0fc58 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 22 Nov 2019 21:16:40 +0100
Subject: Uncomment missing debug implementations rule

---
 native/src/widget/container.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'native/src/widget/container.rs')

diff --git a/native/src/widget/container.rs b/native/src/widget/container.rs
index 64a5f4da..7852eecf 100644
--- a/native/src/widget/container.rs
+++ b/native/src/widget/container.rs
@@ -10,7 +10,7 @@ use std::u32;
 /// An element decorating some content.
 ///
 /// It is normally used for alignment purposes.
-#[allow(missing_docs)]
+#[allow(missing_debug_implementations)]
 pub struct Container<'a, Message, Renderer> {
     width: Length,
     height: Length,
-- 
cgit