me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove border_radius support for slider::Rail

Browse source 
Our current quad shader may produce weird-looking results with
non-integral scaling factors.
This commit is contained in:
Héctor Ramón Jiménez 2023-04-13 05:53:40 +02:00
parent 1de7da1091
commit 52c84c4975
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
4 changed files with 4 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

16
native/src/widget/slider.rs
View file

@ -405,13 +405,7 @@ pub fn draw<T, R>(
width: offset, width: offset,
height: style.rail.width, height: style.rail.width,
}, },
border_radius: [ border_radius: Default::default(),
style.rail.border_radius,
0.0,
0.0,
style.rail.border_radius,
]
.into(),
border_width: 0.0, border_width: 0.0,
border_color: Color::TRANSPARENT, border_color: Color::TRANSPARENT,
}, },
@ -426,13 +420,7 @@ pub fn draw<T, R>(
width: bounds.width - offset, width: bounds.width - offset,
height: style.rail.width, height: style.rail.width,
}, },
border_radius: [ border_radius: Default::default(),
0.0,
style.rail.border_radius,
style.rail.border_radius,
0.0,
]
.into(),
border_width: 0.0, border_width: 0.0,
border_color: Color::TRANSPARENT, border_color: Color::TRANSPARENT,
}, },

16
native/src/widget/vertical_slider.rs
View file

@ -398,13 +398,7 @@ pub fn draw<T, R>(
width: style.rail.width, width: style.rail.width,
height: offset, height: offset,
}, },
border_radius: [ border_radius: Default::default(),
style.rail.border_radius,
style.rail.border_radius,
0.0,
0.0,
]
.into(),
border_width: 0.0, border_width: 0.0,
border_color: Color::TRANSPARENT, border_color: Color::TRANSPARENT,
}, },
@ -419,13 +413,7 @@ pub fn draw<T, R>(
width: style.rail.width, width: style.rail.width,
height: bounds.height - offset, height: bounds.height - offset,
}, },
border_radius: [ border_radius: Default::default(),
0.0,
0.0,
style.rail.border_radius,
style.rail.border_radius,
]
.into(),
border_width: 0.0, border_width: 0.0,
border_color: Color::TRANSPARENT, border_color: Color::TRANSPARENT,
}, },

2
style/src/slider.rs
View file

@ -17,8 +17,6 @@ pub struct Rail {
pub colors: (Color, Color), pub colors: (Color, Color),
/// The width of the stroke of a slider rail. /// The width of the stroke of a slider rail.
pub width: f32, pub width: f32,
/// The border radius of the slider.
pub border_radius: f32,
} }
/// The appearance of the handle of a slider. /// The appearance of the handle of a slider.

1
style/src/theme.rs
View file

@ -422,7 +422,6 @@ impl slider::StyleSheet for Theme {
palette.primary.base.color, palette.primary.base.color,
), ),
width: 2.0, width: 2.0,
border_radius: 2.0,
}, },
handle: slider::Handle { handle: slider::Handle {
color: palette.background.base.color, color: palette.background.base.color,