diff options
author | 2020-06-13 13:21:49 +0200 | |
---|---|---|
committer | 2020-06-13 13:21:49 +0200 | |
commit | f131969c47bb4a32d60d5be4c2bece0688b0a418 (patch) | |
tree | 769fbc48ce33bfcbe0504ae6efc9c9642cd78fc5 /native | |
parent | 2a516dfc4823feb16054e8d484637014e4eedcce (diff) | |
parent | c3643eaf6d90dc8b60c0b762200bf1f8097cdfe9 (diff) | |
download | iced-f131969c47bb4a32d60d5be4c2bece0688b0a418.tar.gz iced-f131969c47bb4a32d60d5be4c2bece0688b0a418.tar.bz2 iced-f131969c47bb4a32d60d5be4c2bece0688b0a418.zip |
Merge pull request #381 from loewenheim/slider_step
Added `step` member to slider widgets
Diffstat (limited to '')
-rw-r--r-- | native/src/widget/slider.rs | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/native/src/widget/slider.rs b/native/src/widget/slider.rs index 753a49fe..8670628c 100644 --- a/native/src/widget/slider.rs +++ b/native/src/widget/slider.rs @@ -16,6 +16,8 @@ use std::{hash::Hash, ops::RangeInclusive}; /// /// A [`Slider`] will try to fill the horizontal space of its container. /// +/// The step size defaults to 1.0. +/// /// [`Slider`]: struct.Slider.html /// /// # Example @@ -38,6 +40,7 @@ use std::{hash::Hash, ops::RangeInclusive}; pub struct Slider<'a, Message, Renderer: self::Renderer> { state: &'a mut State, range: RangeInclusive<f32>, + step: f32, value: f32, on_change: Box<dyn Fn(f32) -> Message>, on_release: Option<Message>, @@ -71,6 +74,7 @@ impl<'a, Message, Renderer: self::Renderer> Slider<'a, Message, Renderer> { state, value: value.max(*range.start()).min(*range.end()), range, + step: 1.0, on_change: Box::new(on_change), on_release: None, width: Length::Fill, @@ -106,6 +110,14 @@ impl<'a, Message, Renderer: self::Renderer> Slider<'a, Message, Renderer> { self.style = style.into(); self } + + /// Sets the step size of the [`Slider`]. + /// + /// [`Slider`]: struct.Slider.html + pub fn step(mut self, step: f32) -> Self { + self.step = step; + self + } } /// The local state of a [`Slider`]. @@ -164,16 +176,16 @@ where ) { let mut change = || { let bounds = layout.bounds(); - if cursor_position.x <= bounds.x { messages.push((self.on_change)(*self.range.start())); } else if cursor_position.x >= bounds.x + bounds.width { messages.push((self.on_change)(*self.range.end())); } else { let percent = (cursor_position.x - bounds.x) / bounds.width; - let value = (self.range.end() - self.range.start()) * percent - + self.range.start(); - + let steps = (percent * (self.range.end() - self.range.start()) + / self.step) + .round(); + let value = steps * self.step + self.range.start(); messages.push((self.on_change)(value)); } }; |