Merge pull request #1882 from nicksenger/shadows

Quad shadows

1 files changed, 11 insertions, 22 deletions

diff --git a/style/src/container.rs b/style/src/container.rs
index 490a9dab..00649c25 100644
--- a/style/src/container.rs
+++ b/style/src/container.rs
@@ -1,19 +1,17 @@
 //! Change the appearance of a container.
-use crate::core::{Background, BorderRadius, Color, Pixels};
+use crate::core::{Background, Border, Color, Pixels, Shadow};
 
 /// The appearance of a container.
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, Default)]
 pub struct Appearance {
     /// The text [`Color`] of the container.
     pub text_color: Option<Color>,
     /// The [`Background`] of the container.
     pub background: Option<Background>,
-    /// The border radius of the container.
-    pub border_radius: BorderRadius,
-    /// The border width of the container.
-    pub border_width: f32,
-    /// The border [`Color`] of the container.
-    pub border_color: Color,
+    /// The [`Border`] of the container.
+    pub border: Border,
+    /// The [`Shadow`] of the container.
+    pub shadow: Shadow,
 }
 
 impl Appearance {
@@ -25,8 +23,11 @@ impl Appearance {
         width: impl Into<Pixels>,
     ) -> Self {
         Self {
-            border_color: color.into(),
-            border_width: width.into().0,
+            border: Border {
+                color: color.into(),
+                width: width.into().0,
+                ..Border::default()
+            },
             ..self
         }
     }
@@ -40,18 +41,6 @@ impl Appearance {
     }
 }
 
-impl std::default::Default for Appearance {
-    fn default() -> Self {
-        Self {
-            text_color: None,
-            background: None,
-            border_radius: 0.0.into(),
-            border_width: 0.0,
-            border_color: Color::TRANSPARENT,
-        }
-    }
-}
-
 /// A set of rules that dictate the [`Appearance`] of a container.
 pub trait StyleSheet {
     /// The supported style of the [`StyleSheet`].