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, 72 deletions

diff --git a/graphics/src/widget/canvas/fill.rs b/graphics/src/widget/canvas/fill.rs
deleted file mode 100644
index e954ebb5..00000000
--- a/graphics/src/widget/canvas/fill.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-//! Fill [crate::widget::canvas::Geometry] with a certain style.
-use crate::{Color, Gradient};
-
-pub use crate::widget::canvas::Style;
-
-/// The style used to fill geometry.
-#[derive(Debug, Clone)]
-pub struct Fill {
-    /// The color or gradient of the fill.
-    ///
-    /// By default, it is set to [`Style::Solid`] with [`Color::BLACK`].
-    pub style: Style,
-
-    /// The fill rule defines how to determine what is inside and what is
-    /// outside of a shape.
-    ///
-    /// See the [SVG specification][1] for more details.
-    ///
-    /// By default, it is set to `NonZero`.
-    ///
-    /// [1]: https://www.w3.org/TR/SVG/painting.html#FillRuleProperty
-    pub rule: FillRule,
-}
-
-impl Default for Fill {
-    fn default() -> Self {
-        Self {
-            style: Style::Solid(Color::BLACK),
-            rule: FillRule::NonZero,
-        }
-    }
-}
-
-impl From<Color> for Fill {
-    fn from(color: Color) -> Fill {
-        Fill {
-            style: Style::Solid(color),
-            ..Fill::default()
-        }
-    }
-}
-
-impl From<Gradient> for Fill {
-    fn from(gradient: Gradient) -> Self {
-        Fill {
-            style: Style::Gradient(gradient),
-            ..Default::default()
-        }
-    }
-}
-
-/// The fill rule defines how to determine what is inside and what is outside of
-/// a shape.
-///
-/// See the [SVG specification][1].
-///
-/// [1]: https://www.w3.org/TR/SVG/painting.html#FillRuleProperty
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-#[allow(missing_docs)]
-pub enum FillRule {
-    NonZero,
-    EvenOdd,
-}
-
-impl From<FillRule> for lyon::tessellation::FillRule {
-    fn from(rule: FillRule) -> lyon::tessellation::FillRule {
-        match rule {
-            FillRule::NonZero => lyon::tessellation::FillRule::NonZero,
-            FillRule::EvenOdd => lyon::tessellation::FillRule::EvenOdd,
-        }
-    }
-}