reivilibre
/
iced-mobile
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #527 from rubik83/master 

Account for empty ranges in `Slider` and `ProgressBar`
This commit is contained in:
Héctor Ramón 2020-11-26 03:51:07 +01:00 committed by GitHub
parent 1f7e8b7f3d c23136a5df
commit 50a1f78996
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
graphics/src/widget/progress_bar.rs
View File

@ -31,10 +31,13 @@ where
style_sheet: &Self::Style, style_sheet: &Self::Style,
) -> Self::Output { ) -> Self::Output {
let style = style_sheet.style(); let style = style_sheet.style();
let (range_start, range_end) = range.into_inner(); let (range_start, range_end) = range.into_inner();
let active_progress_width = bounds.width
* ((value - range_start) / (range_end - range_start).max(1.0)); let active_progress_width = if range_start >= range_end {
0.0
} else {
bounds.width * (value - range_start) / (range_end - range_start)
};
let background = Primitive::Group { let background = Primitive::Group {
primitives: vec![Primitive::Quad { primitives: vec![Primitive::Quad {

12
graphics/src/widget/slider.rs
View File

@ -72,8 +72,6 @@ where
}, },
); );
let (range_start, range_end) = range.into_inner();
let (handle_width, handle_height, handle_border_radius) = match style let (handle_width, handle_height, handle_border_radius) = match style
.handle .handle
.shape .shape
@ -87,8 +85,14 @@ where
} => (f32::from(width), f32::from(bounds.height), border_radius), } => (f32::from(width), f32::from(bounds.height), border_radius),
}; };
let handle_offset = (bounds.width - handle_width) let (range_start, range_end) = range.into_inner();
* ((value - range_start) / (range_end - range_start).max(1.0));
let handle_offset = if range_start >= range_end {
0.0
} else {
(bounds.width - handle_width) * (value - range_start)
/ (range_end - range_start)
};
let handle = Primitive::Quad { let handle = Primitive::Quad {
bounds: Rectangle { bounds: Rectangle {