From 9ba955842913c9e1060bdb98deef9d645917b5cb Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 15 Feb 2021 23:59:31 +0100
Subject: Allow dead code explicitly in `iced_web`

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

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

diff --git a/web/src/widget/container.rs b/web/src/widget/container.rs
index 7187a4f0..8de3cc41 100644
--- a/web/src/widget/container.rs
+++ b/web/src/widget/container.rs
@@ -12,6 +12,7 @@ pub struct Container<'a, Message> {
     width: Length,
     height: Length,
     max_width: u32,
+    #[allow(dead_code)]
     max_height: u32,
     horizontal_alignment: Align,
     vertical_alignment: Align,
-- 
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

---
 web/src/widget/container.rs | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

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

diff --git a/web/src/widget/container.rs b/web/src/widget/container.rs
index 8de3cc41..9040f2ae 100644
--- a/web/src/widget/container.rs
+++ b/web/src/widget/container.rs
@@ -1,5 +1,5 @@
 //! Decorate content and apply alignment.
-use crate::{bumpalo, css, Align, Bus, Css, Element, Length, Widget};
+use crate::{bumpalo, css, Align, Bus, Css, Element, Length, Padding, Widget};
 
 pub use iced_style::container::{Style, StyleSheet};
 
@@ -8,7 +8,7 @@ pub use iced_style::container::{Style, StyleSheet};
 /// It is normally used for alignment purposes.
 #[allow(missing_debug_implementations)]
 pub struct Container<'a, Message> {
-    padding: u16,
+    padding: Padding,
     width: Length,
     height: Length,
     max_width: u32,
@@ -29,7 +29,7 @@ impl<'a, Message> Container<'a, Message> {
         use std::u32;
 
         Container {
-            padding: 0,
+            padding: Padding::ZERO,
             width: Length::Shrink,
             height: Length::Shrink,
             max_width: u32::MAX,
@@ -41,9 +41,14 @@ impl<'a, Message> Container<'a, Message> {
         }
     }
 
-    /// 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
     }
 
@@ -106,24 +111,22 @@ where
 
         let column_class = style_sheet.insert(bump, css::Rule::Column);
 
-        let padding_class =
-            style_sheet.insert(bump, css::Rule::Padding(self.padding));
-
         let style = self.style_sheet.style();
 
         let node = div(bump)
             .attr(
                 "class",
-                bumpalo::format!(in bump, "{} {}", column_class, padding_class).into_bump_str(),
+                bumpalo::format!(in bump, "{}", column_class).into_bump_str(),
             )
             .attr(
                 "style",
                 bumpalo::format!(
                     in bump,
-                    "width: {}; height: {}; max-width: {}; align-items: {}; justify-content: {}; background: {}; color: {}; border-width: {}px; border-color: {}; border-radius: {}px",
+                    "width: {}; height: {}; max-width: {}; padding: {}; align-items: {}; justify-content: {}; background: {}; color: {}; border-width: {}px; border-color: {}; border-radius: {}px",
                     css::length(self.width),
                     css::length(self.height),
                     css::max_length(self.max_width),
+                    css::padding(self.padding),
                     css::align(self.horizontal_alignment),
                     css::align(self.vertical_alignment),
                     style.background.map(css::background).unwrap_or(String::from("initial")),
-- 
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`

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

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

diff --git a/web/src/widget/container.rs b/web/src/widget/container.rs
index 9040f2ae..c006e011 100644
--- a/web/src/widget/container.rs
+++ b/web/src/widget/container.rs
@@ -42,11 +42,6 @@ impl<'a, Message> Container<'a, Message> {
     }
 
     /// 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