From fb9cc0262b30a953e8188897b74abb5106ea1fd8 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 31 Dec 2019 11:36:54 +0100
Subject: Draft basic styling for `Container`

---
 wgpu/src/renderer/widget/container.rs | 46 +++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 wgpu/src/renderer/widget/container.rs

(limited to 'wgpu/src/renderer/widget/container.rs')

diff --git a/wgpu/src/renderer/widget/container.rs b/wgpu/src/renderer/widget/container.rs
new file mode 100644
index 00000000..29c709f8
--- /dev/null
+++ b/wgpu/src/renderer/widget/container.rs
@@ -0,0 +1,46 @@
+use crate::{container, defaults, Defaults, Primitive, Renderer};
+use iced_native::{Element, Layout, Point, Rectangle};
+
+impl iced_native::container::Renderer for Renderer {
+    type Style = Box<dyn container::StyleSheet>;
+
+    fn draw<Message>(
+        &mut self,
+        defaults: &Defaults,
+        bounds: Rectangle,
+        cursor_position: Point,
+        style_sheet: &Self::Style,
+        content: &Element<'_, Message, Self>,
+        content_layout: Layout<'_>,
+    ) -> Self::Output {
+        let style = style_sheet.style();
+
+        let defaults = Defaults {
+            text: defaults::Text {
+                color: style.text_color.unwrap_or(defaults.text.color),
+            },
+            ..*defaults
+        };
+
+        let (content, mouse_cursor) =
+            content.draw(self, &defaults, content_layout, cursor_position);
+
+        match style.background {
+            Some(background) => {
+                let quad = Primitive::Quad {
+                    bounds,
+                    background,
+                    border_radius: style.border_radius,
+                };
+
+                (
+                    Primitive::Group {
+                        primitives: vec![quad, content],
+                    },
+                    mouse_cursor,
+                )
+            }
+            None => (content, mouse_cursor),
+        }
+    }
+}
-- 
cgit 


From 9ab7c47dc7d834ee73bc068f9f34eea4d6946436 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 31 Dec 2019 21:35:42 +0100
Subject: Add `border_width` and `border_color` to `Quad`

---
 wgpu/src/renderer/widget/container.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'wgpu/src/renderer/widget/container.rs')

diff --git a/wgpu/src/renderer/widget/container.rs b/wgpu/src/renderer/widget/container.rs
index 29c709f8..18908571 100644
--- a/wgpu/src/renderer/widget/container.rs
+++ b/wgpu/src/renderer/widget/container.rs
@@ -1,5 +1,5 @@
 use crate::{container, defaults, Defaults, Primitive, Renderer};
-use iced_native::{Element, Layout, Point, Rectangle};
+use iced_native::{Color, Element, Layout, Point, Rectangle};
 
 impl iced_native::container::Renderer for Renderer {
     type Style = Box<dyn container::StyleSheet>;
@@ -31,6 +31,8 @@ impl iced_native::container::Renderer for Renderer {
                     bounds,
                     background,
                     border_radius: style.border_radius,
+                    border_width: 0,
+                    border_color: Color::TRANSPARENT,
                 };
 
                 (
-- 
cgit 


From 2116fbb3c2412030a676c60d65784b9dfa467a0a Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sun, 5 Jan 2020 18:38:03 +0100
Subject: Add border styling to `Container`

---
 wgpu/src/renderer/widget/container.rs | 37 ++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'wgpu/src/renderer/widget/container.rs')

diff --git a/wgpu/src/renderer/widget/container.rs b/wgpu/src/renderer/widget/container.rs
index 18908571..2d4d1db8 100644
--- a/wgpu/src/renderer/widget/container.rs
+++ b/wgpu/src/renderer/widget/container.rs
@@ -1,5 +1,5 @@
 use crate::{container, defaults, Defaults, Primitive, Renderer};
-use iced_native::{Color, Element, Layout, Point, Rectangle};
+use iced_native::{Background, Color, Element, Layout, Point, Rectangle};
 
 impl iced_native::container::Renderer for Renderer {
     type Style = Box<dyn container::StyleSheet>;
@@ -25,24 +25,25 @@ impl iced_native::container::Renderer for Renderer {
         let (content, mouse_cursor) =
             content.draw(self, &defaults, content_layout, cursor_position);
 
-        match style.background {
-            Some(background) => {
-                let quad = Primitive::Quad {
-                    bounds,
-                    background,
-                    border_radius: style.border_radius,
-                    border_width: 0,
-                    border_color: Color::TRANSPARENT,
-                };
+        if style.background.is_some() || style.border_width > 0 {
+            let quad = Primitive::Quad {
+                bounds,
+                background: style
+                    .background
+                    .unwrap_or(Background::Color(Color::TRANSPARENT)),
+                border_radius: style.border_radius,
+                border_width: style.border_width,
+                border_color: style.border_color,
+            };
 
-                (
-                    Primitive::Group {
-                        primitives: vec![quad, content],
-                    },
-                    mouse_cursor,
-                )
-            }
-            None => (content, mouse_cursor),
+            (
+                Primitive::Group {
+                    primitives: vec![quad, content],
+                },
+                mouse_cursor,
+            )
+        } else {
+            (content, mouse_cursor)
         }
     }
 }
-- 
cgit