diff options
author | 2023-04-13 05:53:40 +0200 | |
---|---|---|
committer | 2023-04-13 05:53:40 +0200 | |
commit | 52c84c4975d75baf313243d422d96581daca19bf (patch) | |
tree | 510da2f730af56b364438176b7b44a94369e052c | |
parent | 1de7da1091c697e4f3f746b5df0e02aff7e2bc3e (diff) | |
download | iced-52c84c4975d75baf313243d422d96581daca19bf.tar.gz iced-52c84c4975d75baf313243d422d96581daca19bf.tar.bz2 iced-52c84c4975d75baf313243d422d96581daca19bf.zip |
Remove `border_radius` support for `slider::Rail`
Our current quad shader may produce weird-looking results with
non-integral scaling factors.
-rw-r--r-- | native/src/widget/slider.rs | 16 | ||||
-rw-r--r-- | native/src/widget/vertical_slider.rs | 16 | ||||
-rw-r--r-- | style/src/slider.rs | 2 | ||||
-rw-r--r-- | style/src/theme.rs | 1 |
4 files changed, 4 insertions, 31 deletions
diff --git a/native/src/widget/slider.rs b/native/src/widget/slider.rs index 69c06140..199dc9b3 100644 --- a/native/src/widget/slider.rs +++ b/native/src/widget/slider.rs @@ -405,13 +405,7 @@ pub fn draw<T, R>( width: offset, height: style.rail.width, }, - border_radius: [ - style.rail.border_radius, - 0.0, - 0.0, - style.rail.border_radius, - ] - .into(), + border_radius: Default::default(), border_width: 0.0, border_color: Color::TRANSPARENT, }, @@ -426,13 +420,7 @@ pub fn draw<T, R>( width: bounds.width - offset, height: style.rail.width, }, - border_radius: [ - 0.0, - style.rail.border_radius, - style.rail.border_radius, - 0.0, - ] - .into(), + border_radius: Default::default(), border_width: 0.0, border_color: Color::TRANSPARENT, }, diff --git a/native/src/widget/vertical_slider.rs b/native/src/widget/vertical_slider.rs index a06a200f..b445b9ec 100644 --- a/native/src/widget/vertical_slider.rs +++ b/native/src/widget/vertical_slider.rs @@ -398,13 +398,7 @@ pub fn draw<T, R>( width: style.rail.width, height: offset, }, - border_radius: [ - style.rail.border_radius, - style.rail.border_radius, - 0.0, - 0.0, - ] - .into(), + border_radius: Default::default(), border_width: 0.0, border_color: Color::TRANSPARENT, }, @@ -419,13 +413,7 @@ pub fn draw<T, R>( width: style.rail.width, height: bounds.height - offset, }, - border_radius: [ - 0.0, - 0.0, - style.rail.border_radius, - style.rail.border_radius, - ] - .into(), + border_radius: Default::default(), border_width: 0.0, border_color: Color::TRANSPARENT, }, 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, |