Skip to content

Sliders: replace Into<f64> with AsPrimitive<f64> #3260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tritoke wants to merge 2 commits into
base: master
Choose a base branch
from
+52 −28
Open

Sliders: replace Into<f64> with AsPrimitive<f64> #3260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d60a07
Replace `Into<f64>` with `AsPrimitive<f64>`
tritoke Feb 22, 2026
b1eeaed
Remove unnecessary type annotations
hecrj Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions core/src/angle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,18 @@ impl num_traits::FromPrimitive for Degrees {
}
}

impl num_traits::AsPrimitive<f32> for Degrees {
fn as_(self) -> f32 {
self.0
}
}

impl num_traits::AsPrimitive<f64> for Degrees {
fn as_(self) -> f64 {
f64::from(self.0)
}
}

/// Radians
#[derive(Debug, Copy, Clone, PartialEq, PartialOrd)]
pub struct Radians(pub f32);
Expand Down Expand Up @@ -143,6 +155,18 @@ impl num_traits::FromPrimitive for Radians {
}
}

impl num_traits::AsPrimitive<f32> for Radians {
fn as_(self) -> f32 {
self.0
}
}

impl num_traits::AsPrimitive<f64> for Radians {
fn as_(self) -> f64 {
f64::from(self.0)
}
}

impl Sub for Radians {
type Output = Self;

Expand Down
28 changes: 14 additions & 14 deletions widget/src/slider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ where

impl<T, Message, Theme, Renderer> Widget<Message, Theme, Renderer> for Slider<'_, T, Message, Theme>
where
T: Copy + Into<f64> + num_traits::FromPrimitive,
T: Copy + num_traits::AsPrimitive<f64> + num_traits::FromPrimitive,
Message: Clone,
Theme: Catalog,
Renderer: core::Renderer,
Expand Down Expand Up @@ -268,10 +268,10 @@ where
} else {
self.step
}
.into();
.as_();

let start = (*self.range.start()).into();
let end = (*self.range.end()).into();
let start = (*self.range.start()).as_();
let end = (*self.range.end()).as_();

let percent = f64::from(cursor_position.x - bounds.x) / f64::from(bounds.width);

Expand All @@ -288,12 +288,12 @@ where
} else {
self.step
}
.into();
.as_();

let steps = (value.into() / step).round();
let steps = (value.as_() / step).round();
let new_value = step * (steps + 1.0);

if new_value > (*self.range.end()).into() {
if new_value > (*self.range.end()).as_() {
return Some(*self.range.end());
}

Expand All @@ -306,20 +306,20 @@ where
} else {
self.step
}
.into();
.as_();

let steps = (value.into() / step).round();
let steps = (value.as_() / step).round();
let new_value = step * (steps - 1.0);

if new_value < (*self.range.start()).into() {
if new_value < (*self.range.start()).as_() {
return Some(*self.range.start());
}

T::from_f64(new_value)
};

let change = |new_value: T| {
if (self.value.into() - new_value.into()).abs() > f64::EPSILON {
if (self.value.as_() - new_value.as_()).abs() > f64::EPSILON {
shell.publish((self.on_change)(new_value));

self.value = new_value;
Expand Down Expand Up @@ -438,11 +438,11 @@ where
} => (f32::from(width), bounds.height, border_radius),
};

let value = self.value.into() as f32;
let value = self.value.as_() as f32;
let (range_start, range_end) = {
let (start, end) = self.range.clone().into_inner();

(start.into() as f32, end.into() as f32)
(start.as_() as f32, end.as_() as f32)
};

let offset = if range_start >= range_end {
Expand Down Expand Up @@ -533,7 +533,7 @@ where
impl<'a, T, Message, Theme, Renderer> From<Slider<'a, T, Message, Theme>>
for Element<'a, Message, Theme, Renderer>
where
T: Copy + Into<f64> + num_traits::FromPrimitive + 'a,
T: Copy + num_traits::AsPrimitive<f64> + num_traits::FromPrimitive + 'a,
Message: Clone + 'a,
Theme: Catalog + 'a,
Renderer: core::Renderer + 'a,
Expand Down
28 changes: 14 additions & 14 deletions widget/src/vertical_slider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ where
impl<T, Message, Theme, Renderer> Widget<Message, Theme, Renderer>
for VerticalSlider<'_, T, Message, Theme>
where
T: Copy + Into<f64> + num_traits::FromPrimitive,
T: Copy + num_traits::AsPrimitive<f64> + num_traits::FromPrimitive,
Message: Clone,
Theme: Catalog,
Renderer: core::Renderer,
Expand Down Expand Up @@ -267,10 +267,10 @@ where
} else {
self.step
}
.into();
.as_();

let start = (*self.range.start()).into();
let end = (*self.range.end()).into();
let start = (*self.range.start()).as_();
let end = (*self.range.end()).as_();

let percent =
1.0 - f64::from(cursor_position.y - bounds.y) / f64::from(bounds.height);
Expand All @@ -288,12 +288,12 @@ where
} else {
self.step
}
.into();
.as_();

let steps = (value.into() / step).round();
let steps = (value.as_() / step).round();
let new_value = step * (steps + 1.0);

if new_value > (*self.range.end()).into() {
if new_value > (*self.range.end()).as_() {
return Some(*self.range.end());
}

Expand All @@ -306,20 +306,20 @@ where
} else {
self.step
}
.into();
.as_();

let steps = (value.into() / step).round();
let steps = (value.as_() / step).round();
let new_value = step * (steps - 1.0);

if new_value < (*self.range.start()).into() {
if new_value < (*self.range.start()).as_() {
return Some(*self.range.start());
}

T::from_f64(new_value)
};

let change = |new_value: T| {
if (self.value.into() - new_value.into()).abs() > f64::EPSILON {
if (self.value.as_() - new_value.as_()).abs() > f64::EPSILON {
shell.publish((self.on_change)(new_value));

self.value = new_value;
Expand Down Expand Up @@ -435,11 +435,11 @@ where
} => (f32::from(width), bounds.width, border_radius),
};

let value = self.value.into() as f32;
let value = self.value.as_() as f32;
let (range_start, range_end) = {
let (start, end) = self.range.clone().into_inner();

(start.into() as f32, end.into() as f32)
(start.as_() as f32, end.as_() as f32)
};

let offset = if range_start >= range_end {
Expand Down Expand Up @@ -530,7 +530,7 @@ where
impl<'a, T, Message, Theme, Renderer> From<VerticalSlider<'a, T, Message, Theme>>
for Element<'a, Message, Theme, Renderer>
where
T: Copy + Into<f64> + num_traits::FromPrimitive + 'a,
T: Copy + num_traits::AsPrimitive<f64> + num_traits::FromPrimitive + 'a,
Message: Clone + 'a,
Theme: Catalog + 'a,
Renderer: core::Renderer + 'a,
Expand Down