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/widget/container.rs | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 wgpu/src/widget/container.rs

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

diff --git a/wgpu/src/widget/container.rs b/wgpu/src/widget/container.rs
new file mode 100644
index 00000000..1fc0ec98
--- /dev/null
+++ b/wgpu/src/widget/container.rs
@@ -0,0 +1,37 @@
+use iced_native::{Background, Color};
+
+#[derive(Debug, Clone, Copy)]
+pub struct Style {
+    pub text_color: Option<Color>,
+    pub background: Option<Background>,
+    pub border_radius: u16,
+}
+
+pub trait StyleSheet {
+    fn style(&self) -> Style {
+        Style {
+            text_color: None,
+            background: None,
+            border_radius: 0,
+        }
+    }
+}
+
+struct Default;
+
+impl StyleSheet for Default {}
+
+impl std::default::Default for Box<dyn StyleSheet> {
+    fn default() -> Self {
+        Box::new(Default)
+    }
+}
+
+impl<T> From<T> for Box<dyn StyleSheet>
+where
+    T: 'static + StyleSheet,
+{
+    fn from(style: T) -> Self {
+        Box::new(style)
+    }
+}
-- 
cgit 


From e1062a02d17f5748e4809b76ddcc132f1c912886 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 1 Jan 2020 14:16:10 +0100
Subject: Move styling to a brand new `iced_style` crate

---
 wgpu/src/widget/container.rs | 43 ++++++++-----------------------------------
 1 file changed, 8 insertions(+), 35 deletions(-)

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

diff --git a/wgpu/src/widget/container.rs b/wgpu/src/widget/container.rs
index 1fc0ec98..9a93a246 100644
--- a/wgpu/src/widget/container.rs
+++ b/wgpu/src/widget/container.rs
@@ -1,37 +1,10 @@
-use iced_native::{Background, Color};
+//! Decorate content and apply alignment.
+use crate::Renderer;
 
-#[derive(Debug, Clone, Copy)]
-pub struct Style {
-    pub text_color: Option<Color>,
-    pub background: Option<Background>,
-    pub border_radius: u16,
-}
+pub use iced_style::container::{Style, StyleSheet};
 
-pub trait StyleSheet {
-    fn style(&self) -> Style {
-        Style {
-            text_color: None,
-            background: None,
-            border_radius: 0,
-        }
-    }
-}
-
-struct Default;
-
-impl StyleSheet for Default {}
-
-impl std::default::Default for Box<dyn StyleSheet> {
-    fn default() -> Self {
-        Box::new(Default)
-    }
-}
-
-impl<T> From<T> for Box<dyn StyleSheet>
-where
-    T: 'static + StyleSheet,
-{
-    fn from(style: T) -> Self {
-        Box::new(style)
-    }
-}
+/// An element decorating some content.
+///
+/// This is an alias of an `iced_native` container with a default
+/// `Renderer`.
+pub type Container<'a, Message> = iced_native::Container<'a, Message, Renderer>;
-- 
cgit