diff options
author | 2023-06-01 17:44:00 +0200 | |
---|---|---|
committer | 2023-06-01 17:44:00 +0200 | |
commit | b353767d2d9703aae35f10ebf8a9ee1490c3ae37 (patch) | |
tree | 6fb38a3e4d1fb93eb66ba51bf761841c49cd58cc | |
parent | 44748664c14ad5eec3fc932f278bacf0b01173e3 (diff) | |
parent | 66d4decc0c5c6ea787ec482ff6841829dfc7ffba (diff) | |
download | iced-b353767d2d9703aae35f10ebf8a9ee1490c3ae37.tar.gz iced-b353767d2d9703aae35f10ebf8a9ee1490c3ae37.tar.bz2 iced-b353767d2d9703aae35f10ebf8a9ee1490c3ae37.zip |
Merge pull request #1892 from casperstorm/feat/slider-rail-border-radius
Add `border_radius` to slider rail
Diffstat (limited to '')
-rw-r--r-- | style/src/slider.rs | 2 | ||||
-rw-r--r-- | style/src/theme.rs | 5 | ||||
-rw-r--r-- | widget/src/slider.rs | 4 | ||||
-rw-r--r-- | widget/src/vertical_slider.rs | 4 |
4 files changed, 9 insertions, 6 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..64497181 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, + 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 index 2851d8c3..c2498b87 100644 --- 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 index 3b2430c4..b14e5401 100644 --- 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, }, |