From 9902e778167af8d4b108102619ee1ed8d0de0be5 Mon Sep 17 00:00:00 2001 From: Casper Storm 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 ++- widget/src/slider.rs | 4 ++-- widget/src/vertical_slider.rs | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) 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, diff --git a/widget/src/slider.rs b/widget/src/slider.rs index 2851d8c3..c2498b87 100644 --- a/widget/src/slider.rs +++ b/widget/src/slider.rs @@ -403,7 +403,7 @@ pub fn draw( 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( 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 index 3b2430c4..b14e5401 100644 --- a/widget/src/vertical_slider.rs +++ b/widget/src/vertical_slider.rs @@ -401,7 +401,7 @@ pub fn draw( 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( 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, }, -- cgit