Merge pull request #407 from hecrj/feature/generic-slider

 Make `Slider` value type generic

3 files changed, 68 insertions, 62 deletions

diff --git a/examples/color_palette/src/main.rs b/examples/color_palette/src/main.rs
index 9f39fe56..3186deff 100644
--- a/examples/color_palette/src/main.rs
+++ b/examples/color_palette/src/main.rs
@@ -269,7 +269,7 @@ struct ColorPicker<C: ColorSpace> {
 
 trait ColorSpace: Sized {
     const LABEL: &'static str;
-    const COMPONENT_RANGES: [RangeInclusive<f32>; 3];
+    const COMPONENT_RANGES: [RangeInclusive<f64>; 3];
 
     fn new(a: f32, b: f32, c: f32) -> Self;
 
@@ -284,19 +284,25 @@ impl<C: 'static + ColorSpace + Copy> ColorPicker<C> {
         let [s1, s2, s3] = &mut self.sliders;
         let [cr1, cr2, cr3] = C::COMPONENT_RANGES;
 
+        fn slider<C>(
+            state: &mut slider::State,
+            range: RangeInclusive<f64>,
+            component: f32,
+            update: impl Fn(f32) -> C + 'static,
+        ) -> Slider<f64, C> {
+            Slider::new(state, range, f64::from(component), move |v| {
+                update(v as f32)
+            })
+            .step(0.01)
+        }
+
         Row::new()
             .spacing(10)
             .align_items(Align::Center)
             .push(Text::new(C::LABEL).width(Length::Units(50)))
-            .push(
-                Slider::new(s1, cr1, c1, move |v| C::new(v, c2, c3)).step(0.01),
-            )
-            .push(
-                Slider::new(s2, cr2, c2, move |v| C::new(c1, v, c3)).step(0.01),
-            )
-            .push(
-                Slider::new(s3, cr3, c3, move |v| C::new(c1, c2, v)).step(0.01),
-            )
+            .push(slider(s1, cr1, c1, move |v| C::new(v, c2, c3)))
+            .push(slider(s2, cr2, c2, move |v| C::new(c1, v, c3)))
+            .push(slider(s3, cr3, c3, move |v| C::new(c1, c2, v)))
             .push(
                 Text::new(color.to_string())
                     .width(Length::Units(185))
@@ -308,7 +314,7 @@ impl<C: 'static + ColorSpace + Copy> ColorPicker<C> {
 
 impl ColorSpace for Color {
     const LABEL: &'static str = "RGB";
-    const COMPONENT_RANGES: [RangeInclusive<f32>; 3] =
+    const COMPONENT_RANGES: [RangeInclusive<f64>; 3] =
         [0.0..=1.0, 0.0..=1.0, 0.0..=1.0];
 
     fn new(r: f32, g: f32, b: f32) -> Self {
@@ -331,7 +337,7 @@ impl ColorSpace for Color {
 
 impl ColorSpace for palette::Hsl {
     const LABEL: &'static str = "HSL";
-    const COMPONENT_RANGES: [RangeInclusive<f32>; 3] =
+    const COMPONENT_RANGES: [RangeInclusive<f64>; 3] =
         [0.0..=360.0, 0.0..=1.0, 0.0..=1.0];
 
     fn new(hue: f32, saturation: f32, lightness: f32) -> Self {
@@ -362,7 +368,7 @@ impl ColorSpace for palette::Hsl {
 
 impl ColorSpace for palette::Hsv {
     const LABEL: &'static str = "HSV";
-    const COMPONENT_RANGES: [RangeInclusive<f32>; 3] =
+    const COMPONENT_RANGES: [RangeInclusive<f64>; 3] =
         [0.0..=360.0, 0.0..=1.0, 0.0..=1.0];
 
     fn new(hue: f32, saturation: f32, value: f32) -> Self {
@@ -385,7 +391,7 @@ impl ColorSpace for palette::Hsv {
 
 impl ColorSpace for palette::Hwb {
     const LABEL: &'static str = "HWB";
-    const COMPONENT_RANGES: [RangeInclusive<f32>; 3] =
+    const COMPONENT_RANGES: [RangeInclusive<f64>; 3] =
         [0.0..=360.0, 0.0..=1.0, 0.0..=1.0];
 
     fn new(hue: f32, whiteness: f32, blackness: f32) -> Self {
@@ -416,7 +422,7 @@ impl ColorSpace for palette::Hwb {
 
 impl ColorSpace for palette::Lab {
     const LABEL: &'static str = "Lab";
-    const COMPONENT_RANGES: [RangeInclusive<f32>; 3] =
+    const COMPONENT_RANGES: [RangeInclusive<f64>; 3] =
         [0.0..=100.0, -128.0..=127.0, -128.0..=127.0];
 
     fn new(l: f32, a: f32, b: f32) -> Self {
@@ -434,7 +440,7 @@ impl ColorSpace for palette::Lab {
 
 impl ColorSpace for palette::Lch {
     const LABEL: &'static str = "Lch";
-    const COMPONENT_RANGES: [RangeInclusive<f32>; 3] =
+    const COMPONENT_RANGES: [RangeInclusive<f64>; 3] =
         [0.0..=100.0, 0.0..=128.0, 0.0..=360.0];
 
     fn new(l: f32, chroma: f32, hue: f32) -> Self {
diff --git a/examples/progress_bar/src/main.rs b/examples/progress_bar/src/main.rs
index 43b09928..51b56eda 100644
--- a/examples/progress_bar/src/main.rs
+++ b/examples/progress_bar/src/main.rs
@@ -36,12 +36,15 @@ impl Sandbox for Progress {
         Column::new()
             .padding(20)
             .push(ProgressBar::new(0.0..=100.0, self.value))
-            .push(Slider::new(
-                &mut self.progress_bar_slider,
-                0.0..=100.0,
-                self.value,
-                Message::SliderChanged,
-            ))
+            .push(
+                Slider::new(
+                    &mut self.progress_bar_slider,
+                    0.0..=100.0,
+                    self.value,
+                    Message::SliderChanged,
+                )
+                .step(0.01),
+            )
             .into()
     }
 }
diff --git a/examples/tour/src/main.rs b/examples/tour/src/main.rs
index 43627cc3..4f8a4b32 100644
--- a/examples/tour/src/main.rs
+++ b/examples/tour/src/main.rs
@@ -190,7 +190,7 @@ enum Step {
     Welcome,
     Slider {
         state: slider::State,
-        value: u16,
+        value: u8,
     },
     RowsAndColumns {
         layout: Layout,
@@ -222,13 +222,13 @@ enum Step {
 
 #[derive(Debug, Clone)]
 pub enum StepMessage {
-    SliderChanged(f32),
+    SliderChanged(u8),
     LayoutChanged(Layout),
-    SpacingChanged(f32),
-    TextSizeChanged(f32),
+    SpacingChanged(u16),
+    TextSizeChanged(u16),
     TextColorChanged(Color),
     LanguageSelected(Language),
-    ImageWidthChanged(f32),
+    ImageWidthChanged(u16),
     InputChanged(String),
     ToggleSecureInput(bool),
     DebugToggled(bool),
@@ -249,12 +249,12 @@ impl<'a> Step {
             }
             StepMessage::SliderChanged(new_value) => {
                 if let Step::Slider { value, .. } = self {
-                    *value = new_value.round() as u16;
+                    *value = new_value;
                 }
             }
             StepMessage::TextSizeChanged(new_size) => {
                 if let Step::Text { size, .. } = self {
-                    *size = new_size.round() as u16;
+                    *size = new_size;
                 }
             }
             StepMessage::TextColorChanged(new_color) => {
@@ -269,12 +269,12 @@ impl<'a> Step {
             }
             StepMessage::SpacingChanged(new_spacing) => {
                 if let Step::RowsAndColumns { spacing, .. } = self {
-                    *spacing = new_spacing.round() as u16;
+                    *spacing = new_spacing;
                 }
             }
             StepMessage::ImageWidthChanged(new_width) => {
                 if let Step::Image { width, .. } = self {
-                    *width = new_width.round() as u16;
+                    *width = new_width;
                 }
             }
             StepMessage::InputChanged(new_value) => {
@@ -384,7 +384,7 @@ impl<'a> Step {
 
     fn slider(
         state: &'a mut slider::State,
-        value: u16,
+        value: u8,
     ) -> Column<'a, StepMessage> {
         Self::container("Slider")
             .push(Text::new(
@@ -397,8 +397,8 @@ impl<'a> Step {
             ))
             .push(Slider::new(
                 state,
-                0.0..=100.0,
-                value as f32,
+                0..=100,
+                value,
                 StepMessage::SliderChanged,
             ))
             .push(
@@ -444,8 +444,8 @@ impl<'a> Step {
             .spacing(10)
             .push(Slider::new(
                 spacing_slider,
-                0.0..=80.0,
-                spacing as f32,
+                0..=80,
+                spacing,
                 StepMessage::SpacingChanged,
             ))
             .push(
@@ -486,39 +486,25 @@ impl<'a> Step {
             )
             .push(Slider::new(
                 size_slider,
-                10.0..=70.0,
-                size as f32,
+                10..=70,
+                size,
                 StepMessage::TextSizeChanged,
             ));
 
         let [red, green, blue] = color_sliders;
+
+        let color_sliders = Row::new()
+            .spacing(10)
+            .push(color_slider(red, color.r, move |r| Color { r, ..color }))
+            .push(color_slider(green, color.g, move |g| Color { g, ..color }))
+            .push(color_slider(blue, color.b, move |b| Color { b, ..color }));
+
         let color_section = Column::new()
             .padding(20)
             .spacing(20)
             .push(Text::new("And its color:"))
             .push(Text::new(&format!("{:?}", color)).color(color))
-            .push(
-                Row::new()
-                    .spacing(10)
-                    .push(
-                        Slider::new(red, 0.0..=1.0, color.r, move |r| {
-                            StepMessage::TextColorChanged(Color { r, ..color })
-                        })
-                        .step(0.01),
-                    )
-                    .push(
-                        Slider::new(green, 0.0..=1.0, color.g, move |g| {
-                            StepMessage::TextColorChanged(Color { g, ..color })
-                        })
-                        .step(0.01),
-                    )
-                    .push(
-                        Slider::new(blue, 0.0..=1.0, color.b, move |b| {
-                            StepMessage::TextColorChanged(Color { b, ..color })
-                        })
-                        .step(0.01),
-                    ),
-            );
+            .push(color_sliders);
 
         Self::container("Text")
             .push(Text::new(
@@ -568,8 +554,8 @@ impl<'a> Step {
             .push(ferris(width))
             .push(Slider::new(
                 slider,
-                100.0..=500.0,
-                width as f32,
+                100..=500,
+                width,
                 StepMessage::ImageWidthChanged,
             ))
             .push(
@@ -715,6 +701,17 @@ fn button<'a, Message>(
     .min_width(100)
 }
 
+fn color_slider(
+    state: &mut slider::State,
+    component: f32,
+    update: impl Fn(f32) -> Color + 'static,
+) -> Slider<f64, StepMessage> {
+    Slider::new(state, 0.0..=1.0, f64::from(component), move |c| {
+        StepMessage::TextColorChanged(update(c as f32))
+    })
+    .step(0.01)
+}
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum Language {
     Rust,