Rename DragValue::range to clamp_range and also clamp incoming values

CHANGELOG.md

@@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Most parts of `Response` are now methods, so `if ui.button("…").clicked {` is now `if ui.button("…").clicked() {`.
 * `Response::active` is now gone. You can use `response.dragged()` or `response.clicked()` instead.
 * Backend: pointer (mouse/touch) position and buttons are now passed to egui in the event stream.
+* `DragValue::range` is now called `clamp_range` and also clamps incoming values.
 
 ### Fixed 🐛
 

egui/src/widgets/drag_value.rs

@@ -23,7 +23,7 @@ pub struct DragValue<'a> {
     speed: f32,
     prefix: String,
     suffix: String,
-    range: RangeInclusive<f64>,
+    clamp_range: RangeInclusive<f64>,
     min_decimals: usize,
     max_decimals: Option<usize>,
 }
@@ -35,7 +35,7 @@ impl<'a> DragValue<'a> {
             speed: 1.0,
             prefix: Default::default(),
             suffix: Default::default(),
-            range: f64::NEG_INFINITY..=f64::INFINITY,
+            clamp_range: f64::NEG_INFINITY..=f64::INFINITY,
             min_decimals: 0,
             max_decimals: None,
         }
@@ -85,12 +85,17 @@ impl<'a> DragValue<'a> {
         self
     }
 
-    /// Clamp the value to this range
-    pub fn range(mut self, range: RangeInclusive<f32>) -> Self {
-        self.range = *range.start() as f64..=*range.end() as f64;
+    /// Clamp incoming and outgoing values to this range.
+    pub fn clamp_range(mut self, clamp_range: RangeInclusive<f32>) -> Self {
+        self.clamp_range = *clamp_range.start() as f64..=*clamp_range.end() as f64;
         self
     }
 
+    #[deprecated = "Renamed clamp_range"]
+    pub fn range(self, clamp_range: RangeInclusive<f32>) -> Self {
+        self.clamp_range(clamp_range)
+    }
+
     /// Show a prefix before the number, e.g. "x: "
     pub fn prefix(mut self, prefix: impl ToString) -> Self {
         self.prefix = prefix.to_string();
@@ -138,7 +143,7 @@ impl<'a> Widget for DragValue<'a> {
         let Self {
             mut value_function,
             speed,
-            range,
+            clamp_range,
             prefix,
             suffix,
             min_decimals,
@@ -146,6 +151,7 @@ impl<'a> Widget for DragValue<'a> {
         } = self;
 
         let value = get(&mut value_function);
+        let value = clamp(value, clamp_range.clone());
         let aim_rad = ui.input().physical_pixel_size(); // ui.input().aim_radius(); // TODO
         let auto_decimals = (aim_rad / speed.abs()).log10().ceil().at_least(0.0) as usize;
         let max_decimals = max_decimals.unwrap_or(auto_decimals + 2);
@@ -165,7 +171,7 @@ impl<'a> Widget for DragValue<'a> {
                     .text_style(TextStyle::Monospace),
             );
             if let Ok(parsed_value) = value_text.parse() {
-                let parsed_value = clamp(parsed_value, range);
+                let parsed_value = clamp(parsed_value, clamp_range);
                 set(&mut value_function, parsed_value)
             }
             if ui.input().key_pressed(Key::Enter) {
@@ -195,7 +201,7 @@ impl<'a> Widget for DragValue<'a> {
                 if delta_value != 0.0 {
                     let new_value = value + delta_value as f64;
                     let new_value = math::round_to_decimals(new_value, auto_decimals);
-                    let new_value = clamp(new_value, range);
+                    let new_value = clamp(new_value, clamp_range);
                     set(&mut value_function, new_value);
                     // TODO: To make use or `smart_aim` for `DragValue` we need to store some state somewhere,
                     // otherwise we will just keep rounding to the same value while moving the mouse.

egui/src/widgets/mod.rs

@@ -53,7 +53,7 @@ pub fn reset_button<T: Default + PartialEq>(ui: &mut Ui, value: &mut T) {
 pub fn stroke_ui(ui: &mut crate::Ui, stroke: &mut epaint::Stroke, text: &str) {
     let epaint::Stroke { width, color } = stroke;
     ui.horizontal(|ui| {
-        ui.add(DragValue::f32(width).speed(0.1).range(0.0..=5.0))
+        ui.add(DragValue::f32(width).speed(0.1).clamp_range(0.0..=5.0))
             .on_hover_text("Width");
         ui.color_edit_button_srgba(color);
         ui.label(text);
@@ -70,8 +70,12 @@ pub(crate) fn shadow_ui(ui: &mut Ui, shadow: &mut epaint::Shadow, text: &str) {
     let epaint::Shadow { extrusion, color } = shadow;
     ui.horizontal(|ui| {
         ui.label(text);
-        ui.add(DragValue::f32(extrusion).speed(1.0).range(0.0..=100.0))
-            .on_hover_text("Extrusion");
+        ui.add(
+            DragValue::f32(extrusion)
+                .speed(1.0)
+                .clamp_range(0.0..=100.0),
+        )
+        .on_hover_text("Extrusion");
         ui.color_edit_button_srgba(color);
     });
 }