diff options
| author |  Casper Storm <casper.storm@lich.io> | 2022-12-13 09:31:57 +0100 |
|---|---|---|
| committer | Casper Storm <casper.storm@lich.io> | 2022-12-13 09:31:57 +0100 |
| commit | 2e6d90f141217bad83eacd392562c13d7485881f (patch) | |
| tree | baa2c507076073aed4fd24abc9c7a7949d85c039 /native/src/widget/slider.rs | |
| parent | ba95042fff378213f5029b2b164d79e768482a47 (diff) | |
| parent | 02182eea45537c9eb5b2bddfdff822bb8a3d143d (diff) | |
| download | iced-2e6d90f141217bad83eacd392562c13d7485881f.tar.gz iced-2e6d90f141217bad83eacd392562c13d7485881f.tar.bz2 iced-2e6d90f141217bad83eacd392562c13d7485881f.zip | |
Merge branch 'master' into feat/slider-orientation
Diffstat (limited to 'native/src/widget/slider.rs')
| -rw-r--r-- | native/src/widget/slider.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/native/src/widget/slider.rs b/native/src/widget/slider.rs index 33d87014..bf3383d9 100644 --- a/native/src/widget/slider.rs +++ b/native/src/widget/slider.rs @@ -238,7 +238,7 @@ where self.value, &self.range, theme, - self.style, + &self.style, self.orientation, ) } @@ -394,7 +394,7 @@ pub fn draw<T, R>( value: T, range: &RangeInclusive<T>, style_sheet: &dyn StyleSheet<Style = <R::Theme as StyleSheet>::Style>, - style: <R::Theme as StyleSheet>::Style, + style: &<R::Theme as StyleSheet>::Style, orientation: Orientation, ) where T: Into<f64> + Copy, @@ -433,7 +433,7 @@ pub fn draw<T, R>( height: bounds.height, }, }, - border_radius: 0.0, + border_radius: 0.0.into(), border_width: 0.0, border_color: Color::TRANSPARENT, }, @@ -456,7 +456,7 @@ pub fn draw<T, R>( height: bounds.height, }, }, - border_radius: 0.0, + border_radius: 0.0.into(), border_width: 0.0, border_color: Color::TRANSPARENT, }, @@ -519,7 +519,7 @@ pub fn draw<T, R>( height: handle_width, }, }, - border_radius: handle_border_radius, + border_radius: handle_border_radius.into(), border_width: style.handle.border_width, border_color: style.handle.border_color, }, |