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, 27 insertions, 11 deletions

diff --git a/style/src/pane_grid.rs b/style/src/pane_grid.rs
index fd8fc05f..dfdc9186 100644
--- a/style/src/pane_grid.rs
+++ b/style/src/pane_grid.rs
@@ -1,16 +1,17 @@
 //! Change the appearance of a pane grid.
-use iced_core::Color;
+use iced_core::{Background, BorderRadius, Color};
 
-/// A set of rules that dictate the style of a container.
-pub trait StyleSheet {
-    /// The supported style of the [`StyleSheet`].
-    type Style: Default;
-
-    /// The [`Line`] to draw when a split is picked.
-    fn picked_split(&self, style: &Self::Style) -> Option<Line>;
-
-    /// The [`Line`] to draw when a split is hovered.
-    fn hovered_split(&self, style: &Self::Style) -> Option<Line>;
+/// The appearance of the hovered region of a pane grid.
+#[derive(Debug, Clone, Copy)]
+pub struct Appearance {
+    /// The [`Background`] of the hovered pane region.
+    pub background: Background,
+    /// The border width of the hovered pane region.
+    pub border_width: f32,
+    /// The border [`Color`] of the hovered pane region.
+    pub border_color: Color,
+    /// The border radius of the hovered pane region.
+    pub border_radius: BorderRadius,
 }
 
 /// A line.
@@ -24,3 +25,18 @@ pub struct Line {
     /// The width of the [`Line`].
     pub width: f32,
 }
+
+/// A set of rules that dictate the style of a container.
+pub trait StyleSheet {
+    /// The supported style of the [`StyleSheet`].
+    type Style: Default;
+
+    /// The [`Appearance`] to draw when a pane is hovered.
+    fn hovered_region(&self, style: &Self::Style) -> Appearance;
+
+    /// The [`Line`] to draw when a split is picked.
+    fn picked_split(&self, style: &Self::Style) -> Option<Line>;
+
+    /// The [`Line`] to draw when a split is hovered.
+    fn hovered_split(&self, style: &Self::Style) -> Option<Line>;
+}