Merge pull request #242 from Redhawk18/main

changed number input's bounds to an inclusive range

Cargo.toml

@@ -29,7 +29,7 @@ tab_bar = []
 tabs = ["tab_bar"]
 time_picker = ["chrono", "icons", "iced/canvas"]
 wrap = []
-number_input = ["num-traits"]
+number_input = ["num-format", "num-traits"]
 selection_list = []
 split = []
 menu = []
@@ -67,11 +67,12 @@ default = [
 
 [dependencies]
 cfg-if = "1.0"
+chrono = { version = "0.4.34", optional = true }
+itertools = { version = "0.12.1", optional = true }
+num-format = { version = "0.4.4", optional = true }
 num-traits = { version = "0.2.18", optional = true }
 time = { version = "0.3.34", features = ["local-offset"], optional = true }
-chrono = { version = "0.4.34", optional = true }
 once_cell = { version = "1.19.0", optional = true }
-itertools = { version = "0.12.1", optional = true }
 
 [dependencies.iced]
 #git = "https://github.com/iced-rs/iced.git"

examples/WidgetIDReturn/src/numberinput.rs

@@ -1,6 +1,6 @@
 use iced::{Element, Length};
 use iced_aw::{NumberInput, NumberInputStyles};
-use num_traits::{Num, NumAssignOps};
+use num_traits::{bounds::Bounded, Num, NumAssignOps};
 use std::fmt::Display;
 use std::marker::PhantomData;
 use std::str::FromStr;
@@ -18,7 +18,7 @@ pub enum NumInputMessage<V> {
 
 impl<V> NumInputMessage<V>
 where
- V: Num + NumAssignOps + PartialOrd + Display + FromStr + Copy,
+ V: Num + NumAssignOps + PartialOrd + Display + FromStr + Copy + Bounded,
 {
  pub fn get_data(&self) -> V {
  let NumInputMessage::Change(data) = self;
@@ -38,7 +38,7 @@ where
 
 impl<V, M> NumInput<V, M>
 where
- V: Num + NumAssignOps + PartialOrd + Display + FromStr + Copy,
+ V: Num + NumAssignOps + PartialOrd + Display + FromStr + Copy + Bounded,
  M: Clone,
 {
  pub fn new(value: V) -> NumInput<V, M>
@@ -65,9 +65,8 @@ where
  V: 'static,
  M: 'static,
  {
- let mut input = NumberInput::new(self.value, max, NumInputMessage::Change)
+ let mut input = NumberInput::new(self.value, min..max, NumInputMessage::Change)
  .step(step)
- .min(min)
  .width(Length::Shrink);
 
  if let Some(style) = style {

examples/number_input/src/main.rs

@@ -93,7 +93,7 @@ impl Application for NumberInputDemo {
  .into(),
  NumberInputDemo::Loaded(State { value }) => {
  let lb_minute = Text::new("Number Input:");
- let txt_minute = number_input(*value, 255.0, Message::NumInpChanged)
+ let txt_minute = number_input(*value, 0.0..250.0, Message::NumInpChanged)
  .style(NumberInputStyles::Default)
  .step(0.5);
 

examples/wrap/src/main.rs

@@ -194,22 +194,22 @@ impl Application for RandStrings {
  .push(Text::new("spacing"))
  .push(NumberInput::new(
  state.spacing,
- 500.0,
+ 0.0..500.0,
  Message::ChangeSpacing,
  ));
  let line_spacing_input =
  Column::new()
  .push(Text::new("line spacing"))
  .push(NumberInput::new(
  state.line_spacing,
- 500.0,
+ 0.0..500.0,
  Message::ChangeLineSpacing,
  ));
  let line_minimal_length_input = Column::new()
  .push(Text::new("line minimal length"))
  .push(NumberInput::new(
  state.line_minimal_length,
- 999.0,
+ 0.0..999.9,
  Message::ChangeMinimalLength,
  ));
  let ctrls = Column::new()

src/widgets/helpers.rs

@@ -4,8 +4,9 @@
 
 #[allow(unused_imports)]
 use iced::{self, advanced::renderer, Color, Element};
+use num_traits::bounds::Bounded;
 #[allow(unused_imports)]
-use std::{borrow::Cow, fmt::Display, hash::Hash};
+use std::{borrow::Cow, fmt::Display, hash::Hash, ops::RangeBounds};
 
 /// Creates a [`Grid`] with the given [`GridRow`]s.
 ///
@@ -337,7 +338,7 @@ where
 #[must_use]
 pub fn number_input<'a, T, Message, Theme, Renderer, F>(
  value: T,
- max: T,
+ bounds: impl RangeBounds<T>,
  on_changed: F,
 ) -> crate::NumberInput<'a, T, Message, Theme, Renderer>
 where
@@ -354,9 +355,10 @@ where
  + PartialOrd
  + std::fmt::Display
  + std::str::FromStr
- + Copy,
+ + Copy
+ + Bounded,
 {
- crate::NumberInput::new(value, max, on_changed)
+ crate::NumberInput::new(value, bounds, on_changed)
 }
 
 #[cfg(feature = "selection_list")]
@@ -410,7 +412,7 @@ where
  + crate::style::selection_list::StyleSheet
  + iced::widget::container::StyleSheet
  + iced::widget::scrollable::StyleSheet,
- T: Clone + Display + Eq + Hash,
+ T: Clone + Display + Eq + Hash + Bounded,
  [T]: ToOwned<Owned = Vec<T>>,
 {
  crate::SelectionList::new(options, on_selected)