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')

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')

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')

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')

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