widget: slider: Add stepping functionality

AUTHORS

@@ -16,3 +16,4 @@ Robert Wittams
 Jaap Aarts
 Maximilian Köstler
 Bruno Dupuis
+Christopher Noel Hesse

CHANGELOG.md

@@ -52,6 +52,7 @@ You can find its changes [documented below](#070---2021-01-01).
 - x11: Implement primary_clipboard ([#1867] by [@psychon])
 - x11: Set WM_CLASS property ([#1868] by [@psychon])
 - Expose `RawWindowHandle` for `WindowHandle` under the `raw-win-handle` feature ([#1828] by [@djeedai])
+- Widget/Slider: Add stepping functionality ([#1875] by [@raymanfx])
 
 ### Changed
 

druid/examples/widget_gallery.rs

@@ -152,10 +152,15 @@ fn ui_builder() -> impl Widget<AppData> {
             ))
             .with_child(label_widget(
                 Flex::column()
-                    .with_child(Slider::new().lens(AppData::progressbar))
+                    .with_child(
+                        Slider::new()
+                            .with_range(0.05, 0.95)
+                            .with_step(0.10)
+                            .lens(AppData::progressbar),
+                    )
                     .with_spacer(4.0)
                     .with_child(Label::new(|data: &AppData, _: &_| {
-                        format!("{:3.0}%", data.progressbar * 100.0)
+                        format!("{:3.2}%", data.progressbar * 100.)
                     })),
                 "Slider",
             ))

druid/src/widget/slider.rs

@@ -17,7 +17,7 @@
 use crate::kurbo::{Circle, Shape};
 use crate::widget::prelude::*;
 use crate::{theme, LinearGradient, Point, Rect, UnitPoint};
-use tracing::{instrument, trace};
+use tracing::{instrument, trace, warn};
 
 const TRACK_THICKNESS: f64 = 4.0;
 const BORDER_WIDTH: f64 = 2.0;
@@ -31,6 +31,7 @@ const KNOB_STROKE_WIDTH: f64 = 2.0;
 pub struct Slider {
     min: f64,
     max: f64,
+    step: Option<f64>,
     knob_pos: Point,
     knob_hovered: bool,
     x_offset: f64,
@@ -42,6 +43,7 @@ impl Slider {
         Slider {
             min: 0.,
             max: 1.,
+            step: None,
             knob_pos: Default::default(),
             knob_hovered: Default::default(),
             x_offset: Default::default(),
@@ -56,6 +58,24 @@ impl Slider {
         self.max = max;
         self
     }
+
+    /// Builder-style method to set the stepping.
+    ///
+    /// The default step size is `0.0` (smooth).
+    pub fn with_step(mut self, step: f64) -> Self {
+        if step < 0.0 {
+            warn!("bad stepping (must be positive): {}", step);
+            return self;
+        }
+        self.step = if step > 0.0 {
+            Some(step)
+        } else {
+            // A stepping value of 0.0 would yield an infinite amount of steps.
+            // Enforce no stepping instead.
+            None
+        };
+        self
+    }
 }
 
 impl Slider {
@@ -68,7 +88,24 @@ impl Slider {
         let scalar = ((mouse_x + self.x_offset - knob_width / 2.) / (slider_width - knob_width))
             .max(0.0)
             .min(1.0);
-        self.min + scalar * (self.max - self.min)
+        let mut value = self.min + scalar * (self.max - self.min);
+        if let Some(step) = self.step {
+            let max_step_value = ((self.max - self.min) / step).floor() * step + self.min;
+            if value > max_step_value {
+                // edge case: make sure max is reachable
+                let left_dist = value - max_step_value;
+                let right_dist = self.max - value;
+                value = if left_dist < right_dist {
+                    max_step_value
+                } else {
+                    self.max
+                };
+            } else {
+                // snap to discrete intervals
+                value = (((value - self.min) / step).round() * step + self.min).min(self.max);
+            }
+        }
+        value
     }
 
     fn normalize(&self, data: f64) -> f64 {