Merge pull request #1892 from casperstorm/feat/slider-rail-border-radius

Add `border_radius` to slider rail
iced-rs · Jun 1, 2023 · b353767 · b353767
2 parents 4474866 + 66d4dec
commit b353767
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git 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
@@ -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,
+                        width: 4.0,
+                        border_radius: 2.0.into(),
                     },
                     handle: slider::Handle {
                         color: palette.background.base.color,

diff --git a/widget/src/slider.rs b/widget/src/slider.rs
@@ -403,7 +403,7 @@ pub fn draw<T, R>(
                 width: offset + handle_width / 2.0,
                 height: style.rail.width,
             },
-            border_radius: Default::default(),
+            border_radius: style.rail.border_radius,
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
         },
@@ -418,7 +418,7 @@ pub fn draw<T, R>(
                 width: bounds.width - offset - handle_width / 2.0,
                 height: style.rail.width,
             },
-            border_radius: Default::default(),
+            border_radius: style.rail.border_radius,
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
         },

diff --git a/widget/src/vertical_slider.rs b/widget/src/vertical_slider.rs
@@ -401,7 +401,7 @@ pub fn draw<T, R>(
                 width: style.rail.width,
                 height: offset + handle_width / 2.0,
             },
-            border_radius: Default::default(),
+            border_radius: style.rail.border_radius,
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
         },
@@ -416,7 +416,7 @@ pub fn draw<T, R>(
                 width: style.rail.width,
                 height: bounds.height - offset - handle_width / 2.0,
             },
-            border_radius: Default::default(),
+            border_radius: style.rail.border_radius,
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
         },