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/button.rs    | 77 +-------------------------------------------
 wgpu/src/widget/container.rs | 43 +++++--------------------
 2 files changed, 9 insertions(+), 111 deletions(-)

(limited to 'wgpu/src')

diff --git a/wgpu/src/widget/button.rs b/wgpu/src/widget/button.rs
index 2c4e174f..b738c55e 100644
--- a/wgpu/src/widget/button.rs
+++ b/wgpu/src/widget/button.rs
@@ -5,86 +5,11 @@
 //! [`Button`]: type.Button.html
 //! [`State`]: struct.State.html
 use crate::Renderer;
-use iced_native::{Background, Color};
 
 pub use iced_native::button::State;
+pub use iced_style::button::{Style, StyleSheet};
 
 /// A widget that produces a message when clicked.
 ///
 /// This is an alias of an `iced_native` button with an `iced_wgpu::Renderer`.
 pub type Button<'a, Message> = iced_native::Button<'a, Message, Renderer>;
-
-#[derive(Debug)]
-pub struct Style {
-    pub shadow_offset: f32,
-    pub background: Option<Background>,
-    pub border_radius: u16,
-    pub text_color: Color,
-}
-
-pub trait StyleSheet {
-    fn active(&self) -> Style;
-
-    fn hovered(&self) -> Style {
-        let active = self.active();
-
-        Style {
-            shadow_offset: active.shadow_offset + 1.0,
-            ..active
-        }
-    }
-
-    fn pressed(&self) -> Style {
-        Style {
-            shadow_offset: 0.0,
-            ..self.active()
-        }
-    }
-
-    fn disabled(&self) -> Style {
-        let active = self.active();
-
-        Style {
-            shadow_offset: 0.0,
-            background: active.background.map(|background| match background {
-                Background::Color(color) => Background::Color(Color {
-                    a: color.a * 0.5,
-                    ..color
-                }),
-            }),
-            text_color: Color {
-                a: active.text_color.a * 0.5,
-                ..active.text_color
-            },
-            ..active
-        }
-    }
-}
-
-struct Default;
-
-impl StyleSheet for Default {
-    fn active(&self) -> Style {
-        Style {
-            shadow_offset: 1.0,
-            background: Some(Background::Color([0.5, 0.5, 0.5].into())),
-            border_radius: 5,
-            text_color: Color::BLACK,
-        }
-    }
-}
-
-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)
-    }
-}
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