Skip to content

Commit b85808f

Browse files
coolreader18NoraCodes
authored andcommitted
Change ProgressBarStyle::Determinate to have a u32 instead of an i32
1 parent 9bd20c9 commit b85808f

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

iui/src/controls/progressbar.rs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ define_control! {
1010
}
1111

1212
pub enum ProgressBarStyle {
13-
Determinate(i32),
13+
Determinate(u32),
1414
Indeterminate,
1515
}
1616

@@ -27,21 +27,13 @@ impl ProgressBar {
2727

2828
pub fn set_value(&mut self, value: ProgressBarStyle) {
2929
let sys_value = match value {
30-
ProgressBarStyle::Determinate(value) => {
31-
// use !is_negative() because 0 is a valid value, but it
32-
// returns false for is_positive()
33-
assert!(
34-
!value.is_negative(),
35-
"determinate value for ProgressBar must not be negative"
36-
);
37-
value
38-
}
30+
ProgressBarStyle::Determinate(value) => value as i32,
3931
ProgressBarStyle::Indeterminate => -1,
4032
};
4133
unsafe { ui_sys::uiProgressBarSetValue(self.uiProgressBar, sys_value) }
4234
}
4335

44-
pub fn set_determinate(&mut self, value: i32) {
36+
pub fn set_determinate(&mut self, value: u32) {
4537
self.set_value(ProgressBarStyle::Determinate(value));
4638
}
4739

@@ -54,7 +46,7 @@ impl ProgressBar {
5446
);
5547
ProgressBarStyle::Indeterminate
5648
} else {
57-
ProgressBarStyle::Determinate(sys_value)
49+
ProgressBarStyle::Determinate(sys_value as u32)
5850
}
5951
}
6052
}

0 commit comments

Comments
 (0)