me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename step_fine in slider to shift_step

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-01-31 21:53:29 +01:00
parent 66f8cf8215
commit cd03a0dd24
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
2 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

25
widget/src/slider.rs
View file

@ -51,7 +51,7 @@ where
{ {
range: RangeInclusive<T>, range: RangeInclusive<T>,
step: T, step: T,
step_fine: Option<T>, shift_step: Option<T>,
value: T, value: T,
default: Option<T>, default: Option<T>,
on_change: Box<dyn Fn(T) -> Message + 'a>, on_change: Box<dyn Fn(T) -> Message + 'a>,
@ -63,7 +63,7 @@ where
impl<'a, T, Message, Theme> Slider<'a, T, Message, Theme> impl<'a, T, Message, Theme> Slider<'a, T, Message, Theme>
where where
T: Copy + From<u8> + std::cmp::PartialOrd, T: Copy + From<u8> + PartialOrd,
Message: Clone, Message: Clone,
Theme: StyleSheet, Theme: StyleSheet,
{ {
@ -99,7 +99,7 @@ where
default: None, default: None,
range, range,
step: T::from(1), step: T::from(1),
step_fine: None, shift_step: None,
on_change: Box::new(on_change), on_change: Box::new(on_change),
on_release: None, on_release: None,
width: Length::Fill, width: Length::Fill,
@ -150,10 +150,11 @@ where
self self
} }
/// Sets the optional fine-grained step size for the [`Slider`]. /// Sets the optional "shift" step for the [`Slider`].
/// If set, this value is used as the step size while shift is pressed. ///
pub fn step_fine(mut self, step_fine: impl Into<T>) -> Self { /// If set, this value is used as the step while the shift key is pressed.
self.step_fine = Some(step_fine.into()); pub fn shift_step(mut self, shift_step: impl Into<T>) -> Self {
self.shift_step = Some(shift_step.into());
self self
} }
} }
@ -211,7 +212,7 @@ where
self.default, self.default,
&self.range, &self.range,
self.step, self.step,
self.step_fine, self.shift_step,
self.on_change.as_ref(), self.on_change.as_ref(),
&self.on_release, &self.on_release,
) )
@ -278,7 +279,7 @@ pub fn update<Message, T>(
default: Option<T>, default: Option<T>,
range: &RangeInclusive<T>, range: &RangeInclusive<T>,
step: T, step: T,
step_fine: Option<T>, shift_step: Option<T>,
on_change: &dyn Fn(T) -> Message, on_change: &dyn Fn(T) -> Message,
on_release: &Option<Message>, on_release: &Option<Message>,
) -> event::Status ) -> event::Status
@ -297,7 +298,7 @@ where
Some(*range.end()) Some(*range.end())
} else { } else {
let step = if state.keyboard_modifiers.shift() { let step = if state.keyboard_modifiers.shift() {
step_fine.unwrap_or(step) shift_step.unwrap_or(step)
} else { } else {
step step
} }
@ -320,7 +321,7 @@ where
let increment = |value: T| -> Option<T> { let increment = |value: T| -> Option<T> {
let step = if state.keyboard_modifiers.shift() { let step = if state.keyboard_modifiers.shift() {
step_fine.unwrap_or(step) shift_step.unwrap_or(step)
} else { } else {
step step
} }
@ -338,7 +339,7 @@ where
let decrement = |value: T| -> Option<T> { let decrement = |value: T| -> Option<T> {
let step = if state.keyboard_modifiers.shift() { let step = if state.keyboard_modifiers.shift() {
step_fine.unwrap_or(step) shift_step.unwrap_or(step)
} else { } else {
step step
} }

23
widget/src/vertical_slider.rs
View file

@ -48,7 +48,7 @@ where
{ {
range: RangeInclusive<T>, range: RangeInclusive<T>,
step: T, step: T,
step_fine: Option<T>, shift_step: Option<T>,
value: T, value: T,
default: Option<T>, default: Option<T>,
on_change: Box<dyn Fn(T) -> Message + 'a>, on_change: Box<dyn Fn(T) -> Message + 'a>,
@ -96,7 +96,7 @@ where
default: None, default: None,
range, range,
step: T::from(1), step: T::from(1),
step_fine: None, shift_step: None,
on_change: Box::new(on_change), on_change: Box::new(on_change),
on_release: None, on_release: None,
width: Self::DEFAULT_WIDTH, width: Self::DEFAULT_WIDTH,
@ -147,10 +147,11 @@ where
self self
} }
/// Sets the optional fine-grained step size for the [`VerticalSlider`]. /// Sets the optional "shift" step for the [`VerticalSlider`].
/// If set, this value is used as the step size while shift is pressed. ///
pub fn step_fine(mut self, step_fine: impl Into<T>) -> Self { /// If set, this value is used as the step while the shift key is pressed.
self.step_fine = Some(step_fine.into()); pub fn shift_step(mut self, shift_step: impl Into<T>) -> Self {
self.shift_step = Some(shift_step.into());
self self
} }
} }
@ -208,7 +209,7 @@ where
self.default, self.default,
&self.range, &self.range,
self.step, self.step,
self.step_fine, self.shift_step,
self.on_change.as_ref(), self.on_change.as_ref(),
&self.on_release, &self.on_release,
) )
@ -276,7 +277,7 @@ pub fn update<Message, T>(
default: Option<T>, default: Option<T>,
range: &RangeInclusive<T>, range: &RangeInclusive<T>,
step: T, step: T,
step_fine: Option<T>, shift_step: Option<T>,
on_change: &dyn Fn(T) -> Message, on_change: &dyn Fn(T) -> Message,
on_release: &Option<Message>, on_release: &Option<Message>,
) -> event::Status ) -> event::Status
@ -296,7 +297,7 @@ where
Some(*range.end()) Some(*range.end())
} else { } else {
let step = if state.keyboard_modifiers.shift() { let step = if state.keyboard_modifiers.shift() {
step_fine.unwrap_or(step) shift_step.unwrap_or(step)
} else { } else {
step step
} }
@ -320,7 +321,7 @@ where
let increment = |value: T| -> Option<T> { let increment = |value: T| -> Option<T> {
let step = if state.keyboard_modifiers.shift() { let step = if state.keyboard_modifiers.shift() {
step_fine.unwrap_or(step) shift_step.unwrap_or(step)
} else { } else {
step step
} }
@ -338,7 +339,7 @@ where
let decrement = |value: T| -> Option<T> { let decrement = |value: T| -> Option<T> {
let step = if state.keyboard_modifiers.shift() { let step = if state.keyboard_modifiers.shift() {
step_fine.unwrap_or(step) shift_step.unwrap_or(step)
} else { } else {
step step
} }