From 7d2d813343baae10c2667590463385d50abb784c Mon Sep 17 00:00:00 2001
From: Giuliano Bellini s294739 <s294739@studenti.polito.it>
Date: Mon, 23 Jan 2023 16:57:24 +0100
Subject: added new style for scrollable, to be applied when mouse is over the
 scrollable area

---
 style/src/scrollable.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'style/src')

diff --git a/style/src/scrollable.rs b/style/src/scrollable.rs
index 64ed8462..a3f3db20 100644
--- a/style/src/scrollable.rs
+++ b/style/src/scrollable.rs
@@ -45,6 +45,11 @@ pub trait StyleSheet {
         self.hovered(style)
     }
 
+    /// Produces the style of a scrollbar when mouse is over the scrollable area.
+    fn focused(&self, style: &Self::Style) -> Scrollbar {
+        self.active(style)
+    }
+
     /// Produces the style of an active horizontal scrollbar.
     fn active_horizontal(&self, style: &Self::Style) -> Scrollbar {
         self.active(style)
@@ -59,4 +64,9 @@ pub trait StyleSheet {
     fn dragging_horizontal(&self, style: &Self::Style) -> Scrollbar {
         self.hovered_horizontal(style)
     }
+
+    /// Produces the style of a horizontal scrollbar when mouse is over the scrollable area.
+    fn focused_horizontal(&self, style: &Self::Style) -> Scrollbar {
+        self.active_horizontal(style)
+    }
 }
-- 
cgit 


From 49e9a9a5379c1e9a9469045ca9a51ffb860ee620 Mon Sep 17 00:00:00 2001
From: Giuliano Bellini s294739 <s294739@studenti.polito.it>
Date: Mon, 23 Jan 2023 17:56:39 +0100
Subject: added function focused and focused_horizontal to theme.rs

---
 style/src/theme.rs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'style/src')

diff --git a/style/src/theme.rs b/style/src/theme.rs
index 55bfa4ca..8d40bda1 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -935,6 +935,13 @@ impl scrollable::StyleSheet for Theme {
         }
     }
 
+    fn focused(&self, style: &Self::Style) -> scrollable::Scrollbar {
+        match style {
+            Scrollable::Default => self.active(style),
+            Scrollable::Custom(custom) => custom.focused(self),
+        }
+    }
+
     fn active_horizontal(&self, style: &Self::Style) -> scrollable::Scrollbar {
         match style {
             Scrollable::Default => self.active(style),
@@ -958,6 +965,16 @@ impl scrollable::StyleSheet for Theme {
             Scrollable::Custom(custom) => custom.dragging_horizontal(self),
         }
     }
+
+    fn focused_horizontal(
+        &self,
+        style: &Self::Style,
+    ) -> scrollable::Scrollbar {
+        match style {
+            Scrollable::Default => self.active_horizontal(style),
+            Scrollable::Custom(custom) => custom.focused_horizontal(self),
+        }
+    }
 }
 
 /// The style of text.
-- 
cgit 


From 3a0d34c0240f4421737a6a08761f99d6f8140d02 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 4 Mar 2023 05:37:11 +0100
Subject: Create `iced_widget` subcrate and re-organize the whole codebase

---
 style/src/lib.rs   | 3 +--
 style/src/text.rs  | 2 +-
 style/src/theme.rs | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'style/src')

diff --git a/style/src/lib.rs b/style/src/lib.rs
index 59eb1eb8..286ff9db 100644
--- a/style/src/lib.rs
+++ b/style/src/lib.rs
@@ -18,7 +18,7 @@
 #![deny(missing_docs, unused_results)]
 #![forbid(unsafe_code, rust_2018_idioms)]
 #![allow(clippy::inherent_to_string, clippy::type_complexity)]
-pub use iced_core::{Background, Color};
+pub use iced_core as core;
 
 pub mod application;
 pub mod button;
@@ -33,7 +33,6 @@ pub mod rule;
 pub mod scrollable;
 pub mod slider;
 pub mod svg;
-pub mod text;
 pub mod text_input;
 pub mod theme;
 pub mod toggler;
diff --git a/style/src/text.rs b/style/src/text.rs
index f31c2306..d5a16bef 100644
--- a/style/src/text.rs
+++ b/style/src/text.rs
@@ -1,5 +1,5 @@
 //! Change the appearance of text.
-use iced_core::Color;
+use crate::core::Color;
 
 /// The style sheet of some text.
 pub trait StyleSheet {
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 4ba4facf..b507d096 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -8,6 +8,7 @@ use crate::application;
 use crate::button;
 use crate::checkbox;
 use crate::container;
+use crate::core::widget::text;
 use crate::menu;
 use crate::pane_grid;
 use crate::pick_list;
@@ -17,7 +18,6 @@ use crate::rule;
 use crate::scrollable;
 use crate::slider;
 use crate::svg;
-use crate::text;
 use crate::text_input;
 use crate::toggler;
 
-- 
cgit 


From c337bf297d1836c429cd24964e8b3bdcc13850be Mon Sep 17 00:00:00 2001
From: Giuliano Bellini s294739 <s294739@studenti.polito.it>
Date: Sat, 25 Mar 2023 01:05:56 +0100
Subject: renamed scrollable styles

---
 style/src/scrollable.rs | 14 +++++++-------
 style/src/theme.rs      | 20 ++++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'style/src')

diff --git a/style/src/scrollable.rs b/style/src/scrollable.rs
index a3f3db20..f3c04235 100644
--- a/style/src/scrollable.rs
+++ b/style/src/scrollable.rs
@@ -38,15 +38,15 @@ pub trait StyleSheet {
     fn active(&self, style: &Self::Style) -> Scrollbar;
 
     /// Produces the style of a hovered scrollbar.
-    fn hovered(&self, style: &Self::Style) -> Scrollbar;
+    fn hovered_scrollbar(&self, style: &Self::Style) -> Scrollbar;
 
     /// Produces the style of a scrollbar that is being dragged.
     fn dragging(&self, style: &Self::Style) -> Scrollbar {
-        self.hovered(style)
+        self.hovered_scrollbar(style)
     }
 
     /// Produces the style of a scrollbar when mouse is over the scrollable area.
-    fn focused(&self, style: &Self::Style) -> Scrollbar {
+    fn hovered(&self, style: &Self::Style) -> Scrollbar {
         self.active(style)
     }
 
@@ -56,17 +56,17 @@ pub trait StyleSheet {
     }
 
     /// Produces the style of a hovered horizontal scrollbar.
-    fn hovered_horizontal(&self, style: &Self::Style) -> Scrollbar {
-        self.hovered(style)
+    fn hovered_scrollbar_horizontal(&self, style: &Self::Style) -> Scrollbar {
+        self.hovered_scrollbar(style)
     }
 
     /// Produces the style of a horizontal scrollbar that is being dragged.
     fn dragging_horizontal(&self, style: &Self::Style) -> Scrollbar {
-        self.hovered_horizontal(style)
+        self.hovered_scrollbar_horizontal(style)
     }
 
     /// Produces the style of a horizontal scrollbar when mouse is over the scrollable area.
-    fn focused_horizontal(&self, style: &Self::Style) -> Scrollbar {
+    fn hovered_horizontal(&self, style: &Self::Style) -> Scrollbar {
         self.active_horizontal(style)
     }
 }
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 1d262562..9a3105b5 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -906,7 +906,7 @@ impl scrollable::StyleSheet for Theme {
         }
     }
 
-    fn hovered(&self, style: &Self::Style) -> scrollable::Scrollbar {
+    fn hovered_scrollbar(&self, style: &Self::Style) -> scrollable::Scrollbar {
         match style {
             Scrollable::Default => {
                 let palette = self.extended_palette();
@@ -924,21 +924,21 @@ impl scrollable::StyleSheet for Theme {
                     },
                 }
             }
-            Scrollable::Custom(custom) => custom.hovered(self),
+            Scrollable::Custom(custom) => custom.hovered_scrollbar(self),
         }
     }
 
     fn dragging(&self, style: &Self::Style) -> scrollable::Scrollbar {
         match style {
-            Scrollable::Default => self.hovered(style),
+            Scrollable::Default => self.hovered_scrollbar(style),
             Scrollable::Custom(custom) => custom.dragging(self),
         }
     }
 
-    fn focused(&self, style: &Self::Style) -> scrollable::Scrollbar {
+    fn hovered(&self, style: &Self::Style) -> scrollable::Scrollbar {
         match style {
             Scrollable::Default => self.active(style),
-            Scrollable::Custom(custom) => custom.focused(self),
+            Scrollable::Custom(custom) => custom.hovered(self),
         }
     }
 
@@ -949,10 +949,10 @@ impl scrollable::StyleSheet for Theme {
         }
     }
 
-    fn hovered_horizontal(&self, style: &Self::Style) -> scrollable::Scrollbar {
+    fn hovered_scrollbar_horizontal(&self, style: &Self::Style) -> scrollable::Scrollbar {
         match style {
-            Scrollable::Default => self.hovered(style),
-            Scrollable::Custom(custom) => custom.hovered_horizontal(self),
+            Scrollable::Default => self.hovered_scrollbar(style),
+            Scrollable::Custom(custom) => custom.hovered_scrollbar_horizontal(self),
         }
     }
 
@@ -966,13 +966,13 @@ impl scrollable::StyleSheet for Theme {
         }
     }
 
-    fn focused_horizontal(
+    fn hovered_horizontal(
         &self,
         style: &Self::Style,
     ) -> scrollable::Scrollbar {
         match style {
             Scrollable::Default => self.active_horizontal(style),
-            Scrollable::Custom(custom) => custom.focused_horizontal(self),
+            Scrollable::Custom(custom) => custom.hovered_horizontal(self),
         }
     }
 }
-- 
cgit 


From c407b4504cd5e7dcb04a8fd31ad0400c891fc3e1 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 27 Mar 2023 15:51:32 +0200
Subject: Introduce `is_mouse_over_scrollbar` to `StyleSheet::hovered` for
 `Scrollable`

---
 style/src/scrollable.rs | 32 ++++++++++++-------------
 style/src/theme.rs      | 63 ++++++++++++++++++++++++-------------------------
 2 files changed, 46 insertions(+), 49 deletions(-)

(limited to 'style/src')

diff --git a/style/src/scrollable.rs b/style/src/scrollable.rs
index f3c04235..64a91b69 100644
--- a/style/src/scrollable.rs
+++ b/style/src/scrollable.rs
@@ -37,17 +37,16 @@ pub trait StyleSheet {
     /// Produces the style of an active scrollbar.
     fn active(&self, style: &Self::Style) -> Scrollbar;
 
-    /// Produces the style of a hovered scrollbar.
-    fn hovered_scrollbar(&self, style: &Self::Style) -> Scrollbar;
+    /// Produces the style of a scrollbar when the scrollable is being hovered.
+    fn hovered(
+        &self,
+        style: &Self::Style,
+        is_mouse_over_scrollbar: bool,
+    ) -> Scrollbar;
 
     /// Produces the style of a scrollbar that is being dragged.
     fn dragging(&self, style: &Self::Style) -> Scrollbar {
-        self.hovered_scrollbar(style)
-    }
-
-    /// Produces the style of a scrollbar when mouse is over the scrollable area.
-    fn hovered(&self, style: &Self::Style) -> Scrollbar {
-        self.active(style)
+        self.hovered(style, true)
     }
 
     /// Produces the style of an active horizontal scrollbar.
@@ -55,18 +54,17 @@ pub trait StyleSheet {
         self.active(style)
     }
 
-    /// Produces the style of a hovered horizontal scrollbar.
-    fn hovered_scrollbar_horizontal(&self, style: &Self::Style) -> Scrollbar {
-        self.hovered_scrollbar(style)
+    /// Produces the style of a horizontal scrollbar when the scrollable is being hovered.
+    fn hovered_horizontal(
+        &self,
+        style: &Self::Style,
+        is_mouse_over_scrollbar: bool,
+    ) -> Scrollbar {
+        self.hovered(style, is_mouse_over_scrollbar)
     }
 
     /// Produces the style of a horizontal scrollbar that is being dragged.
     fn dragging_horizontal(&self, style: &Self::Style) -> Scrollbar {
-        self.hovered_scrollbar_horizontal(style)
-    }
-
-    /// Produces the style of a horizontal scrollbar when mouse is over the scrollable area.
-    fn hovered_horizontal(&self, style: &Self::Style) -> Scrollbar {
-        self.active_horizontal(style)
+        self.hovered(style, true)
     }
 }
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 9a3105b5..0ebd82a4 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -906,42 +906,45 @@ impl scrollable::StyleSheet for Theme {
         }
     }
 
-    fn hovered_scrollbar(&self, style: &Self::Style) -> scrollable::Scrollbar {
+    fn hovered(
+        &self,
+        style: &Self::Style,
+        is_mouse_over_scrollbar: bool,
+    ) -> scrollable::Scrollbar {
         match style {
             Scrollable::Default => {
-                let palette = self.extended_palette();
+                if is_mouse_over_scrollbar {
+                    let palette = self.extended_palette();
 
-                scrollable::Scrollbar {
-                    background: palette.background.weak.color.into(),
-                    border_radius: 2.0,
-                    border_width: 0.0,
-                    border_color: Color::TRANSPARENT,
-                    scroller: scrollable::Scroller {
-                        color: palette.primary.strong.color,
+                    scrollable::Scrollbar {
+                        background: palette.background.weak.color.into(),
                         border_radius: 2.0,
                         border_width: 0.0,
                         border_color: Color::TRANSPARENT,
-                    },
+                        scroller: scrollable::Scroller {
+                            color: palette.primary.strong.color,
+                            border_radius: 2.0,
+                            border_width: 0.0,
+                            border_color: Color::TRANSPARENT,
+                        },
+                    }
+                } else {
+                    self.active(style)
                 }
             }
-            Scrollable::Custom(custom) => custom.hovered_scrollbar(self),
+            Scrollable::Custom(custom) => {
+                custom.hovered(self, is_mouse_over_scrollbar)
+            }
         }
     }
 
     fn dragging(&self, style: &Self::Style) -> scrollable::Scrollbar {
         match style {
-            Scrollable::Default => self.hovered_scrollbar(style),
+            Scrollable::Default => self.hovered(style, true),
             Scrollable::Custom(custom) => custom.dragging(self),
         }
     }
 
-    fn hovered(&self, style: &Self::Style) -> scrollable::Scrollbar {
-        match style {
-            Scrollable::Default => self.active(style),
-            Scrollable::Custom(custom) => custom.hovered(self),
-        }
-    }
-
     fn active_horizontal(&self, style: &Self::Style) -> scrollable::Scrollbar {
         match style {
             Scrollable::Default => self.active(style),
@@ -949,30 +952,26 @@ impl scrollable::StyleSheet for Theme {
         }
     }
 
-    fn hovered_scrollbar_horizontal(&self, style: &Self::Style) -> scrollable::Scrollbar {
-        match style {
-            Scrollable::Default => self.hovered_scrollbar(style),
-            Scrollable::Custom(custom) => custom.hovered_scrollbar_horizontal(self),
-        }
-    }
-
-    fn dragging_horizontal(
+    fn hovered_horizontal(
         &self,
         style: &Self::Style,
+        is_mouse_over_scrollbar: bool,
     ) -> scrollable::Scrollbar {
         match style {
-            Scrollable::Default => self.hovered_horizontal(style),
-            Scrollable::Custom(custom) => custom.dragging_horizontal(self),
+            Scrollable::Default => self.hovered(style, is_mouse_over_scrollbar),
+            Scrollable::Custom(custom) => {
+                custom.hovered_horizontal(self, is_mouse_over_scrollbar)
+            }
         }
     }
 
-    fn hovered_horizontal(
+    fn dragging_horizontal(
         &self,
         style: &Self::Style,
     ) -> scrollable::Scrollbar {
         match style {
-            Scrollable::Default => self.active_horizontal(style),
-            Scrollable::Custom(custom) => custom.hovered_horizontal(self),
+            Scrollable::Default => self.hovered_horizontal(style, true),
+            Scrollable::Custom(custom) => custom.dragging_horizontal(self),
         }
     }
 }
-- 
cgit 


From dcccf7064d506abb3aab15227e6cdf34d852514d Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 27 Mar 2023 15:57:51 +0200
Subject: Fix inconsistency in default implementation of
 `scrollable::StyleSheet`

---
 style/src/scrollable.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'style/src')

diff --git a/style/src/scrollable.rs b/style/src/scrollable.rs
index 64a91b69..b528c444 100644
--- a/style/src/scrollable.rs
+++ b/style/src/scrollable.rs
@@ -65,6 +65,6 @@ pub trait StyleSheet {
 
     /// Produces the style of a horizontal scrollbar that is being dragged.
     fn dragging_horizontal(&self, style: &Self::Style) -> Scrollbar {
-        self.hovered(style, true)
+        self.hovered_horizontal(style, true)
     }
 }
-- 
cgit 


From 7b369842959511f17d5c27941fd0308484bff8ea Mon Sep 17 00:00:00 2001
From: Casper Storm <casper.storm@lich.io>
Date: Mon, 13 Feb 2023 11:38:05 +0100
Subject: feat: added handle to text_input

---
 style/src/text_input.rs | 2 ++
 style/src/theme.rs      | 3 +++
 2 files changed, 5 insertions(+)

(limited to 'style/src')

diff --git a/style/src/text_input.rs b/style/src/text_input.rs
index d97016dc..5e703e61 100644
--- a/style/src/text_input.rs
+++ b/style/src/text_input.rs
@@ -12,6 +12,8 @@ pub struct Appearance {
     pub border_width: f32,
     /// The border [`Color`] of the text input.
     pub border_color: Color,
+    /// The handle [`Color`] of the text input.
+    pub handle_color: Color,
 }
 
 /// A set of rules that dictate the style of a text input.
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 0ebd82a4..de46d7d4 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -1028,6 +1028,7 @@ impl text_input::StyleSheet for Theme {
             border_radius: 2.0,
             border_width: 1.0,
             border_color: palette.background.strong.color,
+            handle_color: palette.background.weak.text,
         }
     }
 
@@ -1043,6 +1044,7 @@ impl text_input::StyleSheet for Theme {
             border_radius: 2.0,
             border_width: 1.0,
             border_color: palette.background.base.text,
+            handle_color: palette.background.weak.text,
         }
     }
 
@@ -1058,6 +1060,7 @@ impl text_input::StyleSheet for Theme {
             border_radius: 2.0,
             border_width: 1.0,
             border_color: palette.primary.strong.color,
+            handle_color: palette.primary.weak.text,
         }
     }
 
-- 
cgit 


From bfc5db9009f10a67ed277ce9d1997bcdea3f6acd Mon Sep 17 00:00:00 2001
From: Casper Storm <casper.storm@lich.io>
Date: Mon, 13 Feb 2023 12:00:08 +0100
Subject: Updated `handle_color` for focused state

---
 style/src/theme.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'style/src')

diff --git a/style/src/theme.rs b/style/src/theme.rs
index de46d7d4..4837e10b 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -1060,7 +1060,7 @@ impl text_input::StyleSheet for Theme {
             border_radius: 2.0,
             border_width: 1.0,
             border_color: palette.primary.strong.color,
-            handle_color: palette.primary.weak.text,
+            handle_color: palette.background.weak.text,
         }
     }
 
-- 
cgit 


From d24a4a46895ed711ddfc3199a0445f0b69a812e4 Mon Sep 17 00:00:00 2001
From: Casper Storm <casper.storm@lich.io>
Date: Thu, 16 Feb 2023 14:32:59 +0100
Subject: Changed `Handle` to `Icon` to be consistent

---
 style/src/text_input.rs | 4 ++--
 style/src/theme.rs      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'style/src')

diff --git a/style/src/text_input.rs b/style/src/text_input.rs
index 5e703e61..73b05852 100644
--- a/style/src/text_input.rs
+++ b/style/src/text_input.rs
@@ -12,8 +12,8 @@ pub struct Appearance {
     pub border_width: f32,
     /// The border [`Color`] of the text input.
     pub border_color: Color,
-    /// The handle [`Color`] of the text input.
-    pub handle_color: Color,
+    /// The icon [`Color`] of the text input.
+    pub icon_color: Color,
 }
 
 /// A set of rules that dictate the style of a text input.
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 4837e10b..0d974a19 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -1028,7 +1028,7 @@ impl text_input::StyleSheet for Theme {
             border_radius: 2.0,
             border_width: 1.0,
             border_color: palette.background.strong.color,
-            handle_color: palette.background.weak.text,
+            icon_color: palette.background.weak.text,
         }
     }
 
@@ -1044,7 +1044,7 @@ impl text_input::StyleSheet for Theme {
             border_radius: 2.0,
             border_width: 1.0,
             border_color: palette.background.base.text,
-            handle_color: palette.background.weak.text,
+            icon_color: palette.background.weak.text,
         }
     }
 
@@ -1060,7 +1060,7 @@ impl text_input::StyleSheet for Theme {
             border_radius: 2.0,
             border_width: 1.0,
             border_color: palette.primary.strong.color,
-            handle_color: palette.background.weak.text,
+            icon_color: palette.background.weak.text,
         }
     }
 
-- 
cgit 


From f10e936f00d4b83dcacfdebd2727b1a5cd1add95 Mon Sep 17 00:00:00 2001
From: Dan Mishin <danila.mishin.2001@gmail.com>
Date: Fri, 3 Mar 2023 10:01:49 +0300
Subject: Introduce disabled state for `TextInput`

---
 style/src/text_input.rs |  6 ++++++
 style/src/theme.rs      | 26 ++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

(limited to 'style/src')

diff --git a/style/src/text_input.rs b/style/src/text_input.rs
index 73b05852..2616ad5a 100644
--- a/style/src/text_input.rs
+++ b/style/src/text_input.rs
@@ -33,6 +33,9 @@ pub trait StyleSheet {
     /// Produces the [`Color`] of the value of a text input.
     fn value_color(&self, style: &Self::Style) -> Color;
 
+    /// Produces the [`Color`] of the value of a disabled text input.
+    fn disabled_color(&self, style: &Self::Style) -> Color;
+
     /// Produces the [`Color`] of the selection of a text input.
     fn selection_color(&self, style: &Self::Style) -> Color;
 
@@ -40,4 +43,7 @@ pub trait StyleSheet {
     fn hovered(&self, style: &Self::Style) -> Appearance {
         self.focused(style)
     }
+
+    /// Produces the style of a disabled text input.
+    fn disabled(&self, style: &Self::Style) -> Appearance;
 }
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 0d974a19..e13edb05 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -1093,4 +1093,30 @@ impl text_input::StyleSheet for Theme {
 
         palette.primary.weak.color
     }
+
+    fn disabled(&self, style: &Self::Style) -> text_input::Appearance {
+        if let TextInput::Custom(custom) = style {
+            return custom.disabled(self);
+        }
+
+        let palette = self.extended_palette();
+
+        text_input::Appearance {
+            background: palette.background.base.color.into(),
+            border_radius: 2.0,
+            border_width: 1.0,
+            border_color: palette.background.weak.color,
+            icon_color: palette.background.weak.color,
+        }
+    }
+
+    fn disabled_color(&self, style: &Self::Style) -> Color {
+        if let TextInput::Custom(custom) = style {
+            return custom.value_color(self);
+        }
+
+        let palette = self.extended_palette();
+
+        palette.secondary.strong.color
+    }
 }
-- 
cgit 


From 1de794aabfaa651f021ff2e5831397d7ce9fc53c Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 12 Apr 2023 04:34:37 +0200
Subject: Fine-tune built-in styling of disabled `TextInput`

---
 style/src/theme.rs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'style/src')

diff --git a/style/src/theme.rs b/style/src/theme.rs
index e13edb05..6bd82a96 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -1102,21 +1102,19 @@ impl text_input::StyleSheet for Theme {
         let palette = self.extended_palette();
 
         text_input::Appearance {
-            background: palette.background.base.color.into(),
+            background: palette.background.weak.color.into(),
             border_radius: 2.0,
             border_width: 1.0,
-            border_color: palette.background.weak.color,
-            icon_color: palette.background.weak.color,
+            border_color: palette.background.strong.color,
+            icon_color: palette.background.strong.color,
         }
     }
 
     fn disabled_color(&self, style: &Self::Style) -> Color {
         if let TextInput::Custom(custom) = style {
-            return custom.value_color(self);
+            return custom.disabled_color(self);
         }
 
-        let palette = self.extended_palette();
-
-        palette.secondary.strong.color
+        self.placeholder_color(style)
     }
 }
-- 
cgit 


From de51bc3f41752634c0ccce8484d0a9bade62a45a Mon Sep 17 00:00:00 2001
From: Night_Hunter <samuelhuntnz@gmail.com>
Date: Fri, 6 Jan 2023 14:55:09 +1300
Subject: Introduce left and right colors for slider rails

---
 style/src/slider.rs | 17 ++++++++++++++++-
 style/src/theme.rs  | 14 ++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

(limited to 'style/src')

diff --git a/style/src/slider.rs b/style/src/slider.rs
index 4b52fad3..c143915e 100644
--- a/style/src/slider.rs
+++ b/style/src/slider.rs
@@ -5,11 +5,26 @@ use iced_core::Color;
 #[derive(Debug, Clone, Copy)]
 pub struct Appearance {
     /// The colors of the rail of the slider.
-    pub rail_colors: (Color, Color),
+    pub rail: Rail,
     /// The appearance of the [`Handle`] of the slider.
     pub handle: Handle,
 }
 
+/// The appearance of a slider rail
+#[derive(Debug, Clone, Copy)]
+pub struct Rail {
+    /// The colors of the rail of the slider.
+    pub colors: (Color, Color),
+    /// The height of a slider rail and the width of a vertical slider.
+    pub size: f32,
+    /// The border radius of the slider.
+    pub border_radius: f32,
+    /// The border width of the slider.
+    pub border_width: f32,
+    /// The border [`Color`] of the slider.
+    pub border_color: Color,
+}
+
 /// The appearance of the handle of a slider.
 #[derive(Debug, Clone, Copy)]
 pub struct Handle {
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 6bd82a96..417680a1 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -416,10 +416,16 @@ impl slider::StyleSheet for Theme {
                 };
 
                 slider::Appearance {
-                    rail_colors: (
-                        palette.primary.base.color,
-                        Color::TRANSPARENT,
-                    ),
+                    rail: slider::Rail {
+                        colors: (
+                            palette.primary.base.color,
+                            palette.primary.base.color,
+                        ),
+                        size: 2.0,
+                        border_radius: 0.0,
+                        border_width: 0.0,
+                        border_color: Color::TRANSPARENT,
+                    },
                     handle: slider::Handle {
                         color: palette.background.base.color,
                         border_color: palette.primary.base.color,
-- 
cgit 


From c2cc9a835d8281c1d26c861ecac7991a924c3785 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 12 Apr 2023 05:21:46 +0200
Subject: Remove `border_width` support in `slider::Rail`

---
 style/src/slider.rs | 4 ----
 style/src/theme.rs  | 2 --
 2 files changed, 6 deletions(-)

(limited to 'style/src')

diff --git a/style/src/slider.rs b/style/src/slider.rs
index c143915e..bb36a176 100644
--- a/style/src/slider.rs
+++ b/style/src/slider.rs
@@ -19,10 +19,6 @@ pub struct Rail {
     pub size: f32,
     /// The border radius of the slider.
     pub border_radius: f32,
-    /// The border width of the slider.
-    pub border_width: f32,
-    /// The border [`Color`] of the slider.
-    pub border_color: Color,
 }
 
 /// The appearance of the handle of a slider.
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 417680a1..669d9157 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -423,8 +423,6 @@ impl slider::StyleSheet for Theme {
                         ),
                         size: 2.0,
                         border_radius: 0.0,
-                        border_width: 0.0,
-                        border_color: Color::TRANSPARENT,
                     },
                     handle: slider::Handle {
                         color: palette.background.base.color,
-- 
cgit 


From 6e6804c5c9d0dba921f2e25d2c888b136d22d35e Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 12 Apr 2023 05:25:27 +0200
Subject: Use a `border_radius` of `2.0` for slider rails in built-in theme

---
 style/src/theme.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'style/src')

diff --git a/style/src/theme.rs b/style/src/theme.rs
index 669d9157..2eb825e6 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -422,7 +422,7 @@ impl slider::StyleSheet for Theme {
                             palette.primary.base.color,
                         ),
                         size: 2.0,
-                        border_radius: 0.0,
+                        border_radius: 2.0,
                     },
                     handle: slider::Handle {
                         color: palette.background.base.color,
-- 
cgit 


From 9b39a17628e92b66ac3649e879478ed23635fa76 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 12 Apr 2023 05:27:32 +0200
Subject: Rename `Rail::size` to `width`

---
 style/src/slider.rs | 4 ++--
 style/src/theme.rs  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'style/src')

diff --git a/style/src/slider.rs b/style/src/slider.rs
index bb36a176..d5db1853 100644
--- a/style/src/slider.rs
+++ b/style/src/slider.rs
@@ -15,8 +15,8 @@ pub struct Appearance {
 pub struct Rail {
     /// The colors of the rail of the slider.
     pub colors: (Color, Color),
-    /// The height of a slider rail and the width of a vertical slider.
-    pub size: f32,
+    /// The width of the stroke of a slider rail.
+    pub width: f32,
     /// The border radius of the slider.
     pub border_radius: f32,
 }
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 2eb825e6..b195940e 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -421,7 +421,7 @@ impl slider::StyleSheet for Theme {
                             palette.primary.base.color,
                             palette.primary.base.color,
                         ),
-                        size: 2.0,
+                        width: 2.0,
                         border_radius: 2.0,
                     },
                     handle: slider::Handle {
-- 
cgit 


From 52c84c4975d75baf313243d422d96581daca19bf Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 13 Apr 2023 05:53:40 +0200
Subject: Remove `border_radius` support for `slider::Rail`

Our current quad shader may produce weird-looking results with
non-integral scaling factors.
---
 style/src/slider.rs | 2 --
 style/src/theme.rs  | 1 -
 2 files changed, 3 deletions(-)

(limited to 'style/src')

diff --git a/style/src/slider.rs b/style/src/slider.rs
index d5db1853..884d3871 100644
--- a/style/src/slider.rs
+++ b/style/src/slider.rs
@@ -17,8 +17,6 @@ pub struct Rail {
     pub colors: (Color, Color),
     /// The width of the stroke of a slider rail.
     pub width: f32,
-    /// The border radius of the slider.
-    pub border_radius: f32,
 }
 
 /// The appearance of the handle of a slider.
diff --git a/style/src/theme.rs b/style/src/theme.rs
index b195940e..6711fd72 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -422,7 +422,6 @@ impl slider::StyleSheet for Theme {
                             palette.primary.base.color,
                         ),
                         width: 2.0,
-                        border_radius: 2.0,
                     },
                     handle: slider::Handle {
                         color: palette.background.base.color,
-- 
cgit 


From 47016a37dfe51ebc3cdf290d8afb34ceadb8edae Mon Sep 17 00:00:00 2001
From: Ian Douglas Scott <idscott@system76.com>
Date: Thu, 27 Apr 2023 15:36:45 -0700
Subject: Do not require `Copy` for text `StyleSheet::Style`

For most widgets, `Style` only requires `Default`. A few require
`Clone`. Only this one requires `Copy`.

Some of the types in the default theme has a custom variant requiring
`Box<dyn Trait>`, or `Rc<dyn Trait>` to provide `Clone`, but this isn't
possible if `Copy` is required.

It would be good to also address the inconsistency of requiring `Clone`
in some places and not others.

This removes `style/src/text.rs` which is unused in this branch and thus
confusing. If there's a reason to keep it, that can be removed from the
change.
---
 style/src/text.rs | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 style/src/text.rs

(limited to 'style/src')

diff --git a/style/src/text.rs b/style/src/text.rs
deleted file mode 100644
index d5a16bef..00000000
--- a/style/src/text.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-//! Change the appearance of text.
-use crate::core::Color;
-
-/// The style sheet of some text.
-pub trait StyleSheet {
-    /// The supported style of the [`StyleSheet`].
-    type Style: Default + Copy;
-
-    /// Produces the [`Appearance`] of some text.
-    fn appearance(&self, style: Self::Style) -> Appearance;
-}
-
-/// The apperance of some text.
-#[derive(Debug, Clone, Copy, Default)]
-pub struct Appearance {
-    /// The [`Color`] of the text.
-    ///
-    /// The default, `None`, means using the inherited color.
-    pub color: Option<Color>,
-}
-- 
cgit 


From 6551a0b2ab6c831dd1d3646ecf55180339275e22 Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Thu, 11 May 2023 09:12:06 -0700
Subject: Added support for gradients as background variants + other
 optimizations.

---
 style/src/button.rs | 3 +++
 style/src/theme.rs  | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'style/src')

diff --git a/style/src/button.rs b/style/src/button.rs
index a564a2b7..32ec28b7 100644
--- a/style/src/button.rs
+++ b/style/src/button.rs
@@ -68,6 +68,9 @@ pub trait StyleSheet {
                     a: color.a * 0.5,
                     ..color
                 }),
+                Background::Gradient(gradient) => {
+                    Background::Gradient(gradient.mul_alpha(0.5))
+                }
             }),
             text_color: Color {
                 a: active.text_color.a * 0.5,
diff --git a/style/src/theme.rs b/style/src/theme.rs
index d9893bcf..1b47e2f9 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -217,6 +217,9 @@ impl button::StyleSheet for Theme {
                     a: color.a * 0.5,
                     ..color
                 }),
+                Background::Gradient(gradient) => {
+                    Background::Gradient(gradient.mul_alpha(0.5))
+                }
             }),
             text_color: Color {
                 a: active.text_color.a * 0.5,
-- 
cgit 


From 99aa54cd88d7eb99149699d539ee4d59e08047b1 Mon Sep 17 00:00:00 2001
From: Joao Freitas <51237625+jhff@users.noreply.github.com>
Date: Tue, 16 May 2023 16:12:29 +0100
Subject: Add pane_grid functionality to split a pane with another pane

---
 style/src/pane_grid.rs | 18 +++++++++++++++++-
 style/src/theme.rs     | 19 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

(limited to 'style/src')

diff --git a/style/src/pane_grid.rs b/style/src/pane_grid.rs
index fd8fc05f..ec422e86 100644
--- a/style/src/pane_grid.rs
+++ b/style/src/pane_grid.rs
@@ -1,11 +1,14 @@
 //! Change the appearance of a pane grid.
-use iced_core::Color;
+use iced_core::{Background, 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 [`Region`] to draw when a pane is hovered.
+    fn hovered_region(&self, style: &Self::Style) -> Region;
+
     /// The [`Line`] to draw when a split is picked.
     fn picked_split(&self, style: &Self::Style) -> Option<Line>;
 
@@ -13,6 +16,19 @@ pub trait StyleSheet {
     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 Region {
+    /// 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: f32,
+}
+
 /// A line.
 ///
 /// It is normally used to define the highlight of something, like a split.
diff --git a/style/src/theme.rs b/style/src/theme.rs
index d9893bcf..c7b2bada 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -703,6 +703,25 @@ pub enum PaneGrid {
 impl pane_grid::StyleSheet for Theme {
     type Style = PaneGrid;
 
+    fn hovered_region(&self, style: &Self::Style) -> pane_grid::Region {
+        match style {
+            PaneGrid::Default => {
+                let palette = self.extended_palette();
+
+                pane_grid::Region {
+                    background: Background::Color(Color {
+                        a: 0.5,
+                        ..palette.primary.base.color
+                    }),
+                    border_width: 2.0,
+                    border_color: palette.primary.strong.color,
+                    border_radius: 0.0,
+                }
+            }
+            PaneGrid::Custom(custom) => custom.hovered_region(self),
+        }
+    }
+
     fn picked_split(&self, style: &Self::Style) -> Option<pane_grid::Line> {
         match style {
             PaneGrid::Default => {
-- 
cgit 


From 4c1a082f0468a59099bbf8aa8991420a41234948 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 19 May 2023 03:32:21 +0200
Subject: Remove `Builder` abstractions for gradients

---
 style/src/theme.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'style/src')

diff --git a/style/src/theme.rs b/style/src/theme.rs
index 1b47e2f9..c9835ca3 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -371,7 +371,7 @@ impl container::StyleSheet for Theme {
 
                 container::Appearance {
                     text_color: None,
-                    background: palette.background.weak.color.into(),
+                    background: Some(palette.background.weak.color.into()),
                     border_radius: 2.0,
                     border_width: 0.0,
                     border_color: Color::TRANSPARENT,
@@ -896,7 +896,7 @@ impl scrollable::StyleSheet for Theme {
                 let palette = self.extended_palette();
 
                 scrollable::Scrollbar {
-                    background: palette.background.weak.color.into(),
+                    background: Some(palette.background.weak.color.into()),
                     border_radius: 2.0,
                     border_width: 0.0,
                     border_color: Color::TRANSPARENT,
@@ -923,7 +923,7 @@ impl scrollable::StyleSheet for Theme {
                     let palette = self.extended_palette();
 
                     scrollable::Scrollbar {
-                        background: palette.background.weak.color.into(),
+                        background: Some(palette.background.weak.color.into()),
                         border_radius: 2.0,
                         border_width: 0.0,
                         border_color: Color::TRANSPARENT,
-- 
cgit 


From 96aa0379d58ff799493097e3bd0572f9a87da453 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 19 May 2023 03:43:11 +0200
Subject: Implement `custom` helper for `theme::Button`

---
 style/src/theme.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'style/src')

diff --git a/style/src/theme.rs b/style/src/theme.rs
index c9835ca3..477bd27b 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -139,6 +139,15 @@ pub enum Button {
     Custom(Box<dyn button::StyleSheet<Style = Theme>>),
 }
 
+impl Button {
+    /// Creates a custom [`Button`] style variant.
+    pub fn custom(
+        style_sheet: impl button::StyleSheet<Style = Theme> + 'static,
+    ) -> Self {
+        Self::Custom(Box::new(style_sheet))
+    }
+}
+
 impl button::StyleSheet for Theme {
     type Style = Button;
 
-- 
cgit 


From 0cb84c1c4cc128f8260054192b4f7798de52a82a Mon Sep 17 00:00:00 2001
From: Joao Freitas <51237625+jhff@users.noreply.github.com>
Date: Wed, 17 May 2023 15:30:35 +0100
Subject: Change name of hovered region style struct, reorder lines & export
 Appearance

---
 style/src/pane_grid.rs | 32 ++++++++++++++++----------------
 style/src/theme.rs     |  4 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'style/src')

diff --git a/style/src/pane_grid.rs b/style/src/pane_grid.rs
index ec422e86..c1002725 100644
--- a/style/src/pane_grid.rs
+++ b/style/src/pane_grid.rs
@@ -1,24 +1,9 @@
 //! Change the appearance of a pane grid.
 use iced_core::{Background, 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 [`Region`] to draw when a pane is hovered.
-    fn hovered_region(&self, style: &Self::Style) -> Region;
-
-    /// 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 Region {
+pub struct Appearance {
     /// The [`Background`] of the hovered pane region.
     pub background: Background,
     /// The border width of the hovered pane region.
@@ -40,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 [`Region`] 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>;
+}
diff --git a/style/src/theme.rs b/style/src/theme.rs
index c7b2bada..8a7be72c 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -703,12 +703,12 @@ pub enum PaneGrid {
 impl pane_grid::StyleSheet for Theme {
     type Style = PaneGrid;
 
-    fn hovered_region(&self, style: &Self::Style) -> pane_grid::Region {
+    fn hovered_region(&self, style: &Self::Style) -> pane_grid::Appearance {
         match style {
             PaneGrid::Default => {
                 let palette = self.extended_palette();
 
-                pane_grid::Region {
+                pane_grid::Appearance {
                     background: Background::Color(Color {
                         a: 0.5,
                         ..palette.primary.base.color
-- 
cgit 


From d20493c8a0cc6e2e250434ed4cb6f350ed39d7e8 Mon Sep 17 00:00:00 2001
From: Marien Zwart <marienz@google.com>
Date: Sun, 21 May 2023 23:41:26 +1000
Subject: Support conversion from Fn trait to custom theme

...instead of just from function pointers.

I'm making this change not because I actually want to pass a closure,
but to make passing a single fixed function work. This commit also
simplifies the scrollable example slightly, and without the other half
of this change that simplified example fails to compile with:

```
error[E0277]: the trait bound `iced::theme::ProgressBar: From<for<'a> fn(&'a Theme) -> iced::widget::progress_bar::Appearance {progress_bar_custom_style}>` is not satisfied
   --> examples/scrollable/src/main.rs:292:28
    |
292 |                     .style(progress_bar_custom_style)
    |                      ----- ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `From<for<'a> fn(&'a Theme) -> iced::widget::progress_bar::Appearance {progress_bar_custom_style}>` is not implemented for `iced::theme::ProgressBar`
    |                      |
    |                      required by a bound introduced by this call
    |
    = help: the trait `From<for<'a> fn(&'a Theme) -> iced::widget::progress_bar::Appearance>` is implemented for `iced::theme::ProgressBar`
    = note: required for `for<'a> fn(&'a Theme) -> iced::widget::progress_bar::Appearance {progress_bar_custom_style}` to implement `Into<iced::theme::ProgressBar>`
note: required by a bound in `iced::widget::ProgressBar::<Renderer>::style`
   --> /home/marienz/src/iced/widget/src/progress_bar.rs:77:21
    |
77  |         style: impl Into<<Renderer::Theme as StyleSheet>::Style>,
    |                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `ProgressBar::<Renderer>::style`
```

This happens because `progress_bar_custom_style` by itself is a function
item, which is typically coerced to a function pointer when one is
needed, but not in this case. It is possible to work around this on the
caller's side, but especially since the compiler diagnostic for this is
a bit rough (see https://github.com/rust-lang/rust/issues/100116) let's
try to make it work out of the box.
---
 style/src/theme.rs | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'style/src')

diff --git a/style/src/theme.rs b/style/src/theme.rs
index 6299975d..9500fe9d 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -105,7 +105,7 @@ impl application::StyleSheet for Theme {
     }
 }
 
-impl application::StyleSheet for fn(&Theme) -> application::Appearance {
+impl<T: Fn(&Theme) -> application::Appearance> application::StyleSheet for T {
     type Style = Theme;
 
     fn appearance(&self, style: &Self::Style) -> application::Appearance {
@@ -113,8 +113,10 @@ impl application::StyleSheet for fn(&Theme) -> application::Appearance {
     }
 }
 
-impl From<fn(&Theme) -> application::Appearance> for Application {
-    fn from(f: fn(&Theme) -> application::Appearance) -> Self {
+impl<T: Fn(&Theme) -> application::Appearance + 'static> From<T>
+    for Application
+{
+    fn from(f: T) -> Self {
         Self::Custom(Box::new(f))
     }
 }
@@ -363,8 +365,8 @@ pub enum Container {
     Custom(Box<dyn container::StyleSheet<Style = Theme>>),
 }
 
-impl From<fn(&Theme) -> container::Appearance> for Container {
-    fn from(f: fn(&Theme) -> container::Appearance) -> Self {
+impl<T: Fn(&Theme) -> container::Appearance + 'static> From<T> for Container {
+    fn from(f: T) -> Self {
         Self::Custom(Box::new(f))
     }
 }
@@ -391,7 +393,7 @@ impl container::StyleSheet for Theme {
     }
 }
 
-impl container::StyleSheet for fn(&Theme) -> container::Appearance {
+impl<T: Fn(&Theme) -> container::Appearance> container::StyleSheet for T {
     type Style = Theme;
 
     fn appearance(&self, style: &Self::Style) -> container::Appearance {
@@ -777,8 +779,10 @@ pub enum ProgressBar {
     Custom(Box<dyn progress_bar::StyleSheet<Style = Theme>>),
 }
 
-impl From<fn(&Theme) -> progress_bar::Appearance> for ProgressBar {
-    fn from(f: fn(&Theme) -> progress_bar::Appearance) -> Self {
+impl<T: Fn(&Theme) -> progress_bar::Appearance + 'static> From<T>
+    for ProgressBar
+{
+    fn from(f: T) -> Self {
         Self::Custom(Box::new(f))
     }
 }
@@ -808,7 +812,7 @@ impl progress_bar::StyleSheet for Theme {
     }
 }
 
-impl progress_bar::StyleSheet for fn(&Theme) -> progress_bar::Appearance {
+impl<T: Fn(&Theme) -> progress_bar::Appearance> progress_bar::StyleSheet for T {
     type Style = Theme;
 
     fn appearance(&self, style: &Self::Style) -> progress_bar::Appearance {
@@ -826,8 +830,8 @@ pub enum Rule {
     Custom(Box<dyn rule::StyleSheet<Style = Theme>>),
 }
 
-impl From<fn(&Theme) -> rule::Appearance> for Rule {
-    fn from(f: fn(&Theme) -> rule::Appearance) -> Self {
+impl<T: Fn(&Theme) -> rule::Appearance + 'static> From<T> for Rule {
+    fn from(f: T) -> Self {
         Self::Custom(Box::new(f))
     }
 }
@@ -850,7 +854,7 @@ impl rule::StyleSheet for Theme {
     }
 }
 
-impl rule::StyleSheet for fn(&Theme) -> rule::Appearance {
+impl<T: Fn(&Theme) -> rule::Appearance> rule::StyleSheet for T {
     type Style = Theme;
 
     fn appearance(&self, style: &Self::Style) -> rule::Appearance {
-- 
cgit 


From 1c86defab5f5491b5f6b6e45faabf1b91ed195a3 Mon Sep 17 00:00:00 2001
From: Casper Storm <casper.storm@lich.io>
Date: Tue, 23 May 2023 12:26:16 +0200
Subject: Extend border radius on relevant widgets

---
 style/src/button.rs       |  6 +++---
 style/src/checkbox.rs     |  4 ++--
 style/src/container.rs    |  6 +++---
 style/src/menu.rs         |  4 ++--
 style/src/pane_grid.rs    |  4 ++--
 style/src/pick_list.rs    |  4 ++--
 style/src/progress_bar.rs |  4 ++--
 style/src/rule.rs         |  4 ++--
 style/src/scrollable.rs   |  6 +++---
 style/src/slider.rs       |  4 ++--
 style/src/text_input.rs   |  4 ++--
 style/src/theme.rs        | 36 ++++++++++++++++++------------------
 12 files changed, 43 insertions(+), 43 deletions(-)

(limited to 'style/src')

diff --git a/style/src/button.rs b/style/src/button.rs
index 32ec28b7..e49ad94a 100644
--- a/style/src/button.rs
+++ b/style/src/button.rs
@@ -1,5 +1,5 @@
 //! Change the apperance of a button.
-use iced_core::{Background, Color, Vector};
+use iced_core::{Background, BorderRadius, Color, Vector};
 
 /// The appearance of a button.
 #[derive(Debug, Clone, Copy)]
@@ -9,7 +9,7 @@ pub struct Appearance {
     /// The [`Background`] of the button.
     pub background: Option<Background>,
     /// The border radius of the button.
-    pub border_radius: f32,
+    pub border_radius: BorderRadius,
     /// The border width of the button.
     pub border_width: f32,
     /// The border [`Color`] of the button.
@@ -23,7 +23,7 @@ impl std::default::Default for Appearance {
         Self {
             shadow_offset: Vector::default(),
             background: None,
-            border_radius: 0.0,
+            border_radius: 0.0.into(),
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
             text_color: Color::BLACK,
diff --git a/style/src/checkbox.rs b/style/src/checkbox.rs
index 52b90ec9..cf52c05d 100644
--- a/style/src/checkbox.rs
+++ b/style/src/checkbox.rs
@@ -1,5 +1,5 @@
 //! Change the appearance of a checkbox.
-use iced_core::{Background, Color};
+use iced_core::{Background, BorderRadius, Color};
 
 /// The appearance of a checkbox.
 #[derive(Debug, Clone, Copy)]
@@ -9,7 +9,7 @@ pub struct Appearance {
     /// The icon [`Color`] of the checkbox.
     pub icon_color: Color,
     /// The border radius of the checkbox.
-    pub border_radius: f32,
+    pub border_radius: BorderRadius,
     /// The border width of the checkbox.
     pub border_width: f32,
     /// The border [`Color`] of the checkbox.
diff --git a/style/src/container.rs b/style/src/container.rs
index 560b2d5b..ec543ae4 100644
--- a/style/src/container.rs
+++ b/style/src/container.rs
@@ -1,5 +1,5 @@
 //! Change the appearance of a container.
-use iced_core::{Background, Color};
+use iced_core::{Background, BorderRadius, Color};
 
 /// The appearance of a container.
 #[derive(Debug, Clone, Copy)]
@@ -9,7 +9,7 @@ pub struct Appearance {
     /// The [`Background`] of the container.
     pub background: Option<Background>,
     /// The border radius of the container.
-    pub border_radius: f32,
+    pub border_radius: BorderRadius,
     /// The border width of the container.
     pub border_width: f32,
     /// The border [`Color`] of the container.
@@ -21,7 +21,7 @@ impl std::default::Default for Appearance {
         Self {
             text_color: None,
             background: None,
-            border_radius: 0.0,
+            border_radius: 0.0.into(),
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
         }
diff --git a/style/src/menu.rs b/style/src/menu.rs
index 7d878748..dbf19dae 100644
--- a/style/src/menu.rs
+++ b/style/src/menu.rs
@@ -1,5 +1,5 @@
 //! Change the appearance of menus.
-use iced_core::{Background, Color};
+use iced_core::{Background, BorderRadius, Color};
 
 /// The appearance of a menu.
 #[derive(Debug, Clone, Copy)]
@@ -11,7 +11,7 @@ pub struct Appearance {
     /// The border width of the menu.
     pub border_width: f32,
     /// The border radius of the menu.
-    pub border_radius: f32,
+    pub border_radius: BorderRadius,
     /// The border [`Color`] of the menu.
     pub border_color: Color,
     /// The text [`Color`] of a selected option in the menu.
diff --git a/style/src/pane_grid.rs b/style/src/pane_grid.rs
index c1002725..b99af955 100644
--- a/style/src/pane_grid.rs
+++ b/style/src/pane_grid.rs
@@ -1,5 +1,5 @@
 //! Change the appearance of a pane grid.
-use iced_core::{Background, Color};
+use iced_core::{Background, BorderRadius, Color};
 
 /// The appearance of the hovered region of a pane grid.
 #[derive(Debug, Clone, Copy)]
@@ -11,7 +11,7 @@ pub struct Appearance {
     /// The border [`Color`] of the hovered pane region.
     pub border_color: Color,
     /// The border radius of the hovered pane region.
-    pub border_radius: f32,
+    pub border_radius: BorderRadius,
 }
 
 /// A line.
diff --git a/style/src/pick_list.rs b/style/src/pick_list.rs
index 11e13b01..961c1e93 100644
--- a/style/src/pick_list.rs
+++ b/style/src/pick_list.rs
@@ -1,5 +1,5 @@
 //! Change the appearance of a pick list.
-use iced_core::{Background, Color};
+use iced_core::{Background, BorderRadius, Color};
 
 /// The appearance of a pick list.
 #[derive(Debug, Clone, Copy)]
@@ -13,7 +13,7 @@ pub struct Appearance {
     /// The [`Background`] of the pick list.
     pub background: Background,
     /// The border radius of the pick list.
-    pub border_radius: f32,
+    pub border_radius: BorderRadius,
     /// The border width of the pick list.
     pub border_width: f32,
     /// The border color of the pick list.
diff --git a/style/src/progress_bar.rs b/style/src/progress_bar.rs
index fb1819fc..c05a6ee4 100644
--- a/style/src/progress_bar.rs
+++ b/style/src/progress_bar.rs
@@ -1,5 +1,5 @@
 //! Change the appearance of a progress bar.
-use iced_core::Background;
+use iced_core::{Background, BorderRadius};
 
 /// The appearance of a progress bar.
 #[derive(Debug, Clone, Copy)]
@@ -9,7 +9,7 @@ pub struct Appearance {
     /// The [`Background`] of the bar of the progress bar.
     pub bar: Background,
     /// The border radius of the progress bar.
-    pub border_radius: f32,
+    pub border_radius: BorderRadius,
 }
 
 /// A set of rules that dictate the style of a progress bar.
diff --git a/style/src/rule.rs b/style/src/rule.rs
index b7380747..afae085c 100644
--- a/style/src/rule.rs
+++ b/style/src/rule.rs
@@ -1,5 +1,5 @@
 //! Change the appearance of a rule.
-use iced_core::Color;
+use iced_core::{BorderRadius, Color};
 
 /// The appearance of a rule.
 #[derive(Debug, Clone, Copy)]
@@ -9,7 +9,7 @@ pub struct Appearance {
     /// The width (thickness) of the rule line.
     pub width: u16,
     /// The radius of the line corners.
-    pub radius: f32,
+    pub radius: BorderRadius,
     /// The [`FillMode`] of the rule.
     pub fill_mode: FillMode,
 }
diff --git a/style/src/scrollable.rs b/style/src/scrollable.rs
index b528c444..952c11e1 100644
--- a/style/src/scrollable.rs
+++ b/style/src/scrollable.rs
@@ -1,5 +1,5 @@
 //! Change the appearance of a scrollable.
-use iced_core::{Background, Color};
+use iced_core::{Background, BorderRadius, Color};
 
 /// The appearance of a scrollable.
 #[derive(Debug, Clone, Copy)]
@@ -7,7 +7,7 @@ pub struct Scrollbar {
     /// The [`Background`] of a scrollable.
     pub background: Option<Background>,
     /// The border radius of a scrollable.
-    pub border_radius: f32,
+    pub border_radius: BorderRadius,
     /// The border width of a scrollable.
     pub border_width: f32,
     /// The border [`Color`] of a scrollable.
@@ -22,7 +22,7 @@ pub struct Scroller {
     /// The [`Color`] of the scroller.
     pub color: Color,
     /// The border radius of the scroller.
-    pub border_radius: f32,
+    pub border_radius: BorderRadius,
     /// The border width of the scroller.
     pub border_width: f32,
     /// The border [`Color`] of the scroller.
diff --git a/style/src/slider.rs b/style/src/slider.rs
index 884d3871..ca115f46 100644
--- a/style/src/slider.rs
+++ b/style/src/slider.rs
@@ -1,5 +1,5 @@
 //! Change the apperance of a slider.
-use iced_core::Color;
+use iced_core::{BorderRadius, Color};
 
 /// The appearance of a slider.
 #[derive(Debug, Clone, Copy)]
@@ -45,7 +45,7 @@ pub enum HandleShape {
         /// The width of the rectangle.
         width: u16,
         /// The border radius of the corners of the rectangle.
-        border_radius: f32,
+        border_radius: BorderRadius,
     },
 }
 
diff --git a/style/src/text_input.rs b/style/src/text_input.rs
index 2616ad5a..90251b5c 100644
--- a/style/src/text_input.rs
+++ b/style/src/text_input.rs
@@ -1,5 +1,5 @@
 //! Change the appearance of a text input.
-use iced_core::{Background, Color};
+use iced_core::{Background, BorderRadius, Color};
 
 /// The appearance of a text input.
 #[derive(Debug, Clone, Copy)]
@@ -7,7 +7,7 @@ pub struct Appearance {
     /// The [`Background`] of the text input.
     pub background: Background,
     /// The border radius of the text input.
-    pub border_radius: f32,
+    pub border_radius: BorderRadius,
     /// The border width of the text input.
     pub border_width: f32,
     /// The border [`Color`] of the text input.
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 9500fe9d..4a8ee749 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -157,7 +157,7 @@ impl button::StyleSheet for Theme {
         let palette = self.extended_palette();
 
         let appearance = button::Appearance {
-            border_radius: 2.0,
+            border_radius: 2.0.into(),
             ..button::Appearance::default()
         };
 
@@ -346,7 +346,7 @@ fn checkbox_appearance(
             base.color
         }),
         icon_color,
-        border_radius: 2.0,
+        border_radius: 2.0.into(),
         border_width: 1.0,
         border_color: accent.color,
         text_color: None,
@@ -383,7 +383,7 @@ impl container::StyleSheet for Theme {
                 container::Appearance {
                     text_color: None,
                     background: Some(palette.background.weak.color.into()),
-                    border_radius: 2.0,
+                    border_radius: 2.0.into(),
                     border_width: 0.0,
                     border_color: Color::TRANSPARENT,
                 }
@@ -422,7 +422,7 @@ impl slider::StyleSheet for Theme {
                 let handle = slider::Handle {
                     shape: slider::HandleShape::Rectangle {
                         width: 8,
-                        border_radius: 4.0,
+                        border_radius: 4.0.into(),
                     },
                     color: Color::WHITE,
                     border_color: Color::WHITE,
@@ -507,7 +507,7 @@ impl menu::StyleSheet for Theme {
                     text_color: palette.background.weak.text,
                     background: palette.background.weak.color.into(),
                     border_width: 1.0,
-                    border_radius: 0.0,
+                    border_radius: 0.0.into(),
                     border_color: palette.background.strong.color,
                     selected_text_color: palette.primary.strong.text,
                     selected_background: palette.primary.strong.color.into(),
@@ -553,7 +553,7 @@ impl pick_list::StyleSheet for Theme {
                     background: palette.background.weak.color.into(),
                     placeholder_color: palette.background.strong.color,
                     handle_color: palette.background.weak.text,
-                    border_radius: 2.0,
+                    border_radius: 2.0.into(),
                     border_width: 1.0,
                     border_color: palette.background.strong.color,
                 }
@@ -572,7 +572,7 @@ impl pick_list::StyleSheet for Theme {
                     background: palette.background.weak.color.into(),
                     placeholder_color: palette.background.strong.color,
                     handle_color: palette.background.weak.text,
-                    border_radius: 2.0,
+                    border_radius: 2.0.into(),
                     border_width: 1.0,
                     border_color: palette.primary.strong.color,
                 }
@@ -729,7 +729,7 @@ impl pane_grid::StyleSheet for Theme {
                     }),
                     border_width: 2.0,
                     border_color: palette.primary.strong.color,
-                    border_radius: 0.0,
+                    border_radius: 0.0.into(),
                 }
             }
             PaneGrid::Custom(custom) => custom.hovered_region(self),
@@ -800,7 +800,7 @@ impl progress_bar::StyleSheet for Theme {
         let from_palette = |bar: Color| progress_bar::Appearance {
             background: palette.background.strong.color.into(),
             bar: bar.into(),
-            border_radius: 2.0,
+            border_radius: 2.0.into(),
         };
 
         match style {
@@ -846,7 +846,7 @@ impl rule::StyleSheet for Theme {
             Rule::Default => rule::Appearance {
                 color: palette.background.strong.color,
                 width: 1,
-                radius: 0.0,
+                radius: 0.0.into(),
                 fill_mode: rule::FillMode::Full,
             },
             Rule::Custom(custom) => custom.appearance(self),
@@ -929,12 +929,12 @@ impl scrollable::StyleSheet for Theme {
 
                 scrollable::Scrollbar {
                     background: Some(palette.background.weak.color.into()),
-                    border_radius: 2.0,
+                    border_radius: 2.0.into(),
                     border_width: 0.0,
                     border_color: Color::TRANSPARENT,
                     scroller: scrollable::Scroller {
                         color: palette.background.strong.color,
-                        border_radius: 2.0,
+                        border_radius: 2.0.into(),
                         border_width: 0.0,
                         border_color: Color::TRANSPARENT,
                     },
@@ -956,12 +956,12 @@ impl scrollable::StyleSheet for Theme {
 
                     scrollable::Scrollbar {
                         background: Some(palette.background.weak.color.into()),
-                        border_radius: 2.0,
+                        border_radius: 2.0.into(),
                         border_width: 0.0,
                         border_color: Color::TRANSPARENT,
                         scroller: scrollable::Scroller {
                             color: palette.primary.strong.color,
-                            border_radius: 2.0,
+                            border_radius: 2.0.into(),
                             border_width: 0.0,
                             border_color: Color::TRANSPARENT,
                         },
@@ -1063,7 +1063,7 @@ impl text_input::StyleSheet for Theme {
 
         text_input::Appearance {
             background: palette.background.base.color.into(),
-            border_radius: 2.0,
+            border_radius: 2.0.into(),
             border_width: 1.0,
             border_color: palette.background.strong.color,
             icon_color: palette.background.weak.text,
@@ -1079,7 +1079,7 @@ impl text_input::StyleSheet for Theme {
 
         text_input::Appearance {
             background: palette.background.base.color.into(),
-            border_radius: 2.0,
+            border_radius: 2.0.into(),
             border_width: 1.0,
             border_color: palette.background.base.text,
             icon_color: palette.background.weak.text,
@@ -1095,7 +1095,7 @@ impl text_input::StyleSheet for Theme {
 
         text_input::Appearance {
             background: palette.background.base.color.into(),
-            border_radius: 2.0,
+            border_radius: 2.0.into(),
             border_width: 1.0,
             border_color: palette.primary.strong.color,
             icon_color: palette.background.weak.text,
@@ -1141,7 +1141,7 @@ impl text_input::StyleSheet for Theme {
 
         text_input::Appearance {
             background: palette.background.weak.color.into(),
-            border_radius: 2.0,
+            border_radius: 2.0.into(),
             border_width: 1.0,
             border_color: palette.background.strong.color,
             icon_color: palette.background.strong.color,
-- 
cgit 


From 2d21d0900e9fcabfc01a7deaaab5b4fd4b8573e8 Mon Sep 17 00:00:00 2001
From: Clark Moody <clark@clarkmoody.com>
Date: Thu, 25 May 2023 13:59:58 -0500
Subject: Upgrade `palette` dependency

---
 style/src/theme/palette.rs | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'style/src')

diff --git a/style/src/theme/palette.rs b/style/src/theme/palette.rs
index 0f15494b..aaeb799d 100644
--- a/style/src/theme/palette.rs
+++ b/style/src/theme/palette.rs
@@ -2,7 +2,9 @@
 use iced_core::Color;
 
 use once_cell::sync::Lazy;
-use palette::{FromColor, Hsl, Mix, RelativeContrast, Srgb};
+use palette::color_difference::Wcag21RelativeContrast;
+use palette::rgb::Rgb;
+use palette::{FromColor, Hsl, Mix};
 
 /// A color palette.
 #[derive(Debug, Clone, Copy, PartialEq)]
@@ -298,11 +300,11 @@ fn deviate(color: Color, amount: f32) -> Color {
 }
 
 fn mix(a: Color, b: Color, factor: f32) -> Color {
-    let a_lin = Srgb::from(a).into_linear();
-    let b_lin = Srgb::from(b).into_linear();
+    let a_lin = Rgb::from(a).into_linear();
+    let b_lin = Rgb::from(b).into_linear();
 
-    let mixed = a_lin.mix(&b_lin, factor);
-    Srgb::from_linear(mixed).into()
+    let mixed = a_lin.mix(b_lin, factor);
+    Rgb::from_linear(mixed).into()
 }
 
 fn readable(background: Color, text: Color) -> Color {
@@ -320,16 +322,16 @@ fn is_dark(color: Color) -> bool {
 }
 
 fn is_readable(a: Color, b: Color) -> bool {
-    let a_srgb = Srgb::from(a);
-    let b_srgb = Srgb::from(b);
+    let a_srgb = Rgb::from(a);
+    let b_srgb = Rgb::from(b);
 
-    a_srgb.has_enhanced_contrast_text(&b_srgb)
+    a_srgb.has_enhanced_contrast_text(b_srgb)
 }
 
 fn to_hsl(color: Color) -> Hsl {
-    Hsl::from_color(Srgb::from(color))
+    Hsl::from_color(Rgb::from(color))
 }
 
 fn from_hsl(hsl: Hsl) -> Color {
-    Srgb::from_color(hsl).into()
+    Rgb::from_color(hsl).into()
 }
-- 
cgit 


From 9902e778167af8d4b108102619ee1ed8d0de0be5 Mon Sep 17 00:00:00 2001
From: Casper Storm <casper.storm@lich.io>
Date: Thu, 1 Jun 2023 10:46:33 +0200
Subject: Add border_radius to slider rail

---
 style/src/slider.rs | 2 ++
 style/src/theme.rs  | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'style/src')

diff --git a/style/src/slider.rs b/style/src/slider.rs
index ca115f46..f0068558 100644
--- a/style/src/slider.rs
+++ b/style/src/slider.rs
@@ -17,6 +17,8 @@ pub struct Rail {
     pub colors: (Color, Color),
     /// The width of the stroke of a slider rail.
     pub width: f32,
+    /// The border radius of the corners of the rail.
+    pub border_radius: BorderRadius,
 }
 
 /// The appearance of the handle of a slider.
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 4a8ee749..4fef8554 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -433,9 +433,10 @@ impl slider::StyleSheet for Theme {
                     rail: slider::Rail {
                         colors: (
                             palette.primary.base.color,
-                            palette.primary.base.color,
+                            palette.secondary.base.color,
                         ),
                         width: 2.0,
+                        border_radius: Default::default(),
                     },
                     handle: slider::Handle {
                         color: palette.background.base.color,
-- 
cgit 


From ee0dd4c623f579635ae74db3d22256090c17a1eb Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 1 Jun 2023 17:25:56 +0200
Subject: Change default styling of `Slider` to leverage rounded borders

---
 style/src/theme.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'style/src')

diff --git a/style/src/theme.rs b/style/src/theme.rs
index 4fef8554..64497181 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -435,8 +435,8 @@ impl slider::StyleSheet for Theme {
                             palette.primary.base.color,
                             palette.secondary.base.color,
                         ),
-                        width: 2.0,
-                        border_radius: Default::default(),
+                        width: 4.0,
+                        border_radius: 2.0.into(),
                     },
                     handle: slider::Handle {
                         color: palette.background.base.color,
-- 
cgit 


From e5c9dd54b3f51e913f39b38e8907c321c8bfd040 Mon Sep 17 00:00:00 2001
From: Joao Freitas <51237625+jhff@users.noreply.github.com>
Date: Fri, 19 May 2023 11:24:52 +0100
Subject: Add ability to drag pane to the pane grid edges & optional style for
 dragged pane

---
 style/src/pane_grid.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'style/src')

diff --git a/style/src/pane_grid.rs b/style/src/pane_grid.rs
index b99af955..dfdc9186 100644
--- a/style/src/pane_grid.rs
+++ b/style/src/pane_grid.rs
@@ -31,7 +31,7 @@ pub trait StyleSheet {
     /// The supported style of the [`StyleSheet`].
     type Style: Default;
 
-    /// The [`Region`] to draw when a pane is hovered.
+    /// 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.
-- 
cgit