Merge remote-tracking branch 'origin/master' into feat/multi-window-support

# Conflicts:
#	Cargo.toml
#	core/src/window/icon.rs
#	core/src/window/id.rs
#	core/src/window/position.rs
#	core/src/window/settings.rs
#	examples/integration/src/main.rs
#	examples/integration_opengl/src/main.rs
#	glutin/src/application.rs
#	native/src/subscription.rs
#	native/src/window.rs
#	runtime/src/window/action.rs
#	src/lib.rs
#	src/window.rs
#	winit/Cargo.toml
#	winit/src/application.rs
#	winit/src/icon.rs
#	winit/src/settings.rs
#	winit/src/window.rs

1 files changed, 0 insertions, 23 deletions

diff --git a/graphics/src/widget/canvas/style.rs b/graphics/src/widget/canvas/style.rs
deleted file mode 100644
index 6794f2e7..00000000
--- a/graphics/src/widget/canvas/style.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use crate::{Color, Gradient};
-
-/// The coloring style of some drawing.
-#[derive(Debug, Clone, PartialEq)]
-pub enum Style {
-    /// A solid [`Color`].
-    Solid(Color),
-
-    /// A [`Gradient`] color.
-    Gradient(Gradient),
-}
-
-impl From<Color> for Style {
-    fn from(color: Color) -> Self {
-        Self::Solid(color)
-    }
-}
-
-impl From<Gradient> for Style {
-    fn from(gradient: Gradient) -> Self {
-        Self::Gradient(gradient)
-    }
-}