summaryrefslogtreecommitdiffstats
path: root/widget
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2024-01-31 21:53:29 +0100
committerLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2024-01-31 21:53:29 +0100
commitcd03a0dd24e300a8a39006e99ee647045e370591 (patch)
tree132bf49e87a9ffaf5c06869aa8b83efc164101c6 /widget
parent66f8cf8215c1bcdf8bf7e5b698b901b49fd87c78 (diff)
downloadiced-cd03a0dd24e300a8a39006e99ee647045e370591.tar.gz
iced-cd03a0dd24e300a8a39006e99ee647045e370591.tar.bz2
iced-cd03a0dd24e300a8a39006e99ee647045e370591.zip
Rename `step_fine` in `slider` to `shift_step`
Diffstat (limited to 'widget')
-rw-r--r--widget/src/slider.rs25
-rw-r--r--widget/src/vertical_slider.rs23
2 files changed, 25 insertions, 23 deletions
diff --git a/widget/src/slider.rs b/widget/src/slider.rs
index ef451d43..a372f8e7 100644
--- a/widget/src/slider.rs
+++ b/widget/src/slider.rs
@@ -51,7 +51,7 @@ where
{
range: RangeInclusive<T>,
step: T,
- step_fine: Option<T>,
+ shift_step: Option<T>,
value: T,
default: Option<T>,
on_change: Box<dyn Fn(T) -> Message + 'a>,
@@ -63,7 +63,7 @@ where
impl<'a, T, Message, Theme> Slider<'a, T, Message, Theme>
where
- T: Copy + From<u8> + std::cmp::PartialOrd,
+ T: Copy + From<u8> + PartialOrd,
Message: Clone,
Theme: StyleSheet,
{
@@ -99,7 +99,7 @@ where
default: None,
range,
step: T::from(1),
- step_fine: None,
+ shift_step: None,
on_change: Box::new(on_change),
on_release: None,
width: Length::Fill,
@@ -150,10 +150,11 @@ where
self
}
- /// Sets the optional fine-grained step size 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 {
- self.step_fine = Some(step_fine.into());
+ /// Sets the optional "shift" step for the [`Slider`].
+ ///
+ /// If set, this value is used as the step while the shift key is pressed.
+ pub fn shift_step(mut self, shift_step: impl Into<T>) -> Self {
+ self.shift_step = Some(shift_step.into());
self
}
}
@@ -211,7 +212,7 @@ where
self.default,
&self.range,
self.step,
- self.step_fine,
+ self.shift_step,
self.on_change.as_ref(),
&self.on_release,
)
@@ -278,7 +279,7 @@ pub fn update<Message, T>(
default: Option<T>,
range: &RangeInclusive<T>,
step: T,
- step_fine: Option<T>,
+ shift_step: Option<T>,
on_change: &dyn Fn(T) -> Message,
on_release: &Option<Message>,
) -> event::Status
@@ -297,7 +298,7 @@ where
Some(*range.end())
} else {
let step = if state.keyboard_modifiers.shift() {
- step_fine.unwrap_or(step)
+ shift_step.unwrap_or(step)
} else {
step
}
@@ -320,7 +321,7 @@ where
let increment = |value: T| -> Option<T> {
let step = if state.keyboard_modifiers.shift() {
- step_fine.unwrap_or(step)
+ shift_step.unwrap_or(step)
} else {
step
}
@@ -338,7 +339,7 @@ where
let decrement = |value: T| -> Option<T> {
let step = if state.keyboard_modifiers.shift() {
- step_fine.unwrap_or(step)
+ shift_step.unwrap_or(step)
} else {
step
}
diff --git a/widget/src/vertical_slider.rs b/widget/src/vertical_slider.rs
index 9c49d8f5..06c27752 100644
--- a/widget/src/vertical_slider.rs
+++ b/widget/src/vertical_slider.rs
@@ -48,7 +48,7 @@ where
{
range: RangeInclusive<T>,
step: T,
- step_fine: Option<T>,
+ shift_step: Option<T>,
value: T,
default: Option<T>,
on_change: Box<dyn Fn(T) -> Message + 'a>,
@@ -96,7 +96,7 @@ where
default: None,
range,
step: T::from(1),
- step_fine: None,
+ shift_step: None,
on_change: Box::new(on_change),
on_release: None,
width: Self::DEFAULT_WIDTH,
@@ -147,10 +147,11 @@ where
self
}
- /// Sets the optional fine-grained step size 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 {
- self.step_fine = Some(step_fine.into());
+ /// Sets the optional "shift" step for the [`VerticalSlider`].
+ ///
+ /// If set, this value is used as the step while the shift key is pressed.
+ pub fn shift_step(mut self, shift_step: impl Into<T>) -> Self {
+ self.shift_step = Some(shift_step.into());
self
}
}
@@ -208,7 +209,7 @@ where
self.default,
&self.range,
self.step,
- self.step_fine,
+ self.shift_step,
self.on_change.as_ref(),
&self.on_release,
)
@@ -276,7 +277,7 @@ pub fn update<Message, T>(
default: Option<T>,
range: &RangeInclusive<T>,
step: T,
- step_fine: Option<T>,
+ shift_step: Option<T>,
on_change: &dyn Fn(T) -> Message,
on_release: &Option<Message>,
) -> event::Status
@@ -296,7 +297,7 @@ where
Some(*range.end())
} else {
let step = if state.keyboard_modifiers.shift() {
- step_fine.unwrap_or(step)
+ shift_step.unwrap_or(step)
} else {
step
}
@@ -320,7 +321,7 @@ where
let increment = |value: T| -> Option<T> {
let step = if state.keyboard_modifiers.shift() {
- step_fine.unwrap_or(step)
+ shift_step.unwrap_or(step)
} else {
step
}
@@ -338,7 +339,7 @@ where
let decrement = |value: T| -> Option<T> {
let step = if state.keyboard_modifiers.shift() {
- step_fine.unwrap_or(step)
+ shift_step.unwrap_or(step)
} else {
step
}