From 21971e0037c2ddcb96fd48ea96332445de4137bb Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 10 Mar 2021 01:59:02 +0100
Subject: Make `Clipboard` argument in `Widget` trait mutable

---
 native/src/widget/container.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/native/src/widget/container.rs b/native/src/widget/container.rs
index 65764148..69fe699b 100644
--- a/native/src/widget/container.rs
+++ b/native/src/widget/container.rs
@@ -151,17 +151,17 @@ where
         event: Event,
         layout: Layout<'_>,
         cursor_position: Point,
-        messages: &mut Vec<Message>,
         renderer: &Renderer,
-        clipboard: Option<&dyn Clipboard>,
+        clipboard: &mut dyn Clipboard,
+        messages: &mut Vec<Message>,
     ) -> event::Status {
         self.content.widget.on_event(
             event,
             layout.children().next().unwrap(),
             cursor_position,
-            messages,
             renderer,
             clipboard,
+            messages,
         )
     }
 
-- 
cgit 


From fe0a27c56d9d75fb521e69352259f1d737402a20 Mon Sep 17 00:00:00 2001
From: Ben LeFevre <ben@lefev.dev>
Date: Mon, 23 Nov 2020 17:19:21 +0000
Subject: Add support for asymmetrical padding

---
 native/src/widget/container.rs | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

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

diff --git a/native/src/widget/container.rs b/native/src/widget/container.rs
index 69fe699b..cf5cb3dc 100644
--- a/native/src/widget/container.rs
+++ b/native/src/widget/container.rs
@@ -5,7 +5,8 @@ use crate::event::{self, Event};
 use crate::layout;
 use crate::overlay;
 use crate::{
-    Align, Clipboard, Element, Hasher, Layout, Length, Point, Rectangle, Widget,
+    Align, Clipboard, Element, Hasher, Layout, Length, Padding, Point,
+    Rectangle, Widget,
 };
 
 use std::u32;
@@ -15,7 +16,7 @@ use std::u32;
 /// It is normally used for alignment purposes.
 #[allow(missing_debug_implementations)]
 pub struct Container<'a, Message, Renderer: self::Renderer> {
-    padding: u16,
+    padding: Padding,
     width: Length,
     height: Length,
     max_width: u32,
@@ -36,7 +37,7 @@ where
         T: Into<Element<'a, Message, Renderer>>,
     {
         Container {
-            padding: 0,
+            padding: Padding::ZERO,
             width: Length::Shrink,
             height: Length::Shrink,
             max_width: u32::MAX,
@@ -48,9 +49,14 @@ where
         }
     }
 
-    /// Sets the padding of the [`Container`].
-    pub fn padding(mut self, units: u16) -> Self {
-        self.padding = units;
+    /// Sets the [`Padding`] of the [`Container`].
+    ///```ignore
+    /// Container::new(/*...*/).padding(20);              // 20px on all sides
+    /// Container::new(/*...*/).padding([10, 20]);        // top/bottom, left/right
+    /// Container::new(/*...*/).padding([5, 10, 15, 20]); // top, right, bottom, left
+    /// ```
+    pub fn padding<P: Into<Padding>>(mut self, padding: P) -> Self {
+        self.padding = padding.into();
         self
     }
 
@@ -127,23 +133,24 @@ where
         renderer: &Renderer,
         limits: &layout::Limits,
     ) -> layout::Node {
-        let padding = f32::from(self.padding);
-
         let limits = limits
             .loose()
             .max_width(self.max_width)
             .max_height(self.max_height)
             .width(self.width)
             .height(self.height)
-            .pad(padding);
+            .pad(self.padding);
 
         let mut content = self.content.layout(renderer, &limits.loose());
         let size = limits.resolve(content.size());
 
-        content.move_to(Point::new(padding, padding));
+        content.move_to(Point::new(
+            self.padding.left.into(),
+            self.padding.top.into(),
+        ));
         content.align(self.horizontal_alignment, self.vertical_alignment, size);
 
-        layout::Node::with_children(size.pad(padding), vec![content])
+        layout::Node::with_children(size.pad(self.padding), vec![content])
     }
 
     fn on_event(
-- 
cgit 


From 8a3b71df8b619571ce0a972826cb5a3987b66b3d Mon Sep 17 00:00:00 2001
From: Héctor Ramón <hector@lich.io>
Date: Tue, 1 Jun 2021 19:45:47 +0700
Subject: Replace ignored doc-tests with additional documentation for `Padding`

---
 native/src/widget/container.rs | 5 -----
 1 file changed, 5 deletions(-)

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

diff --git a/native/src/widget/container.rs b/native/src/widget/container.rs
index cf5cb3dc..69aee64d 100644
--- a/native/src/widget/container.rs
+++ b/native/src/widget/container.rs
@@ -50,11 +50,6 @@ where
     }
 
     /// Sets the [`Padding`] of the [`Container`].
-    ///```ignore
-    /// Container::new(/*...*/).padding(20);              // 20px on all sides
-    /// Container::new(/*...*/).padding([10, 20]);        // top/bottom, left/right
-    /// Container::new(/*...*/).padding([5, 10, 15, 20]); // top, right, bottom, left
-    /// ```
     pub fn padding<P: Into<Padding>>(mut self, padding: P) -> Self {
         self.padding = padding.into();
         self
-- 
cgit