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, 73 insertions, 0 deletions

diff --git a/graphics/src/geometry/fill.rs b/graphics/src/geometry/fill.rs
new file mode 100644
index 00000000..b773c99b
--- /dev/null
+++ b/graphics/src/geometry/fill.rs
@@ -0,0 +1,73 @@
+//! Fill [crate::widget::canvas::Geometry] with a certain style.
+pub use crate::geometry::Style;
+
+use crate::core::Color;
+use crate::gradient::{self, Gradient};
+
+/// 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: Rule,
+}
+
+impl Default for Fill {
+    fn default() -> Self {
+        Self {
+            style: Style::Solid(Color::BLACK),
+            rule: Rule::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()
+        }
+    }
+}
+
+impl From<gradient::Linear> for Fill {
+    fn from(gradient: gradient::Linear) -> Self {
+        Fill {
+            style: Style::Gradient(Gradient::Linear(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 Rule {
+    NonZero,
+    EvenOdd,
+}