Skip to content

fix: RangeSlider issues with non-zero min #442

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
migroble wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: RangeSlider issues with non-zero min #442

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 14 additions & 14 deletions thaw/src/slider/range_slider/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ pub fn RangeSlider(
let min = min.get();
let max = max.get();

value / (max - min) * 100.0
(value - min) / (max - min) * 100.0
});

let right_progress = Memo::new(move |_| {
let value = current_value.get().1;
let min = min.get();
let max = max.get();

value / (max - min) * 100.0
(value - min) / (max - min) * 100.0
});

let css_vars = move || {
Expand Down Expand Up @@ -124,23 +124,23 @@ pub fn RangeSlider(
let max = max.get_untracked();

let rail_rect = rail_el.get_bounding_client_rect();
let percentage = if vertical.get_untracked() {
let value = if vertical.get_untracked() {
let ev_y = f64::from(e.y());
let rail_height = rail_rect.height();
(rail_height + rail_rect.y() - ev_y) / rail_height * (max - min)
(rail_height + rail_rect.y() - ev_y) / rail_height * (max - min) + min
} else {
let ev_x = f64::from(e.x());
(ev_x - rail_rect.x()) / rail_rect.width() * (max - min)
(ev_x - rail_rect.x()) / rail_rect.width() * (max - min) + min
};

let (left, right) = current_value.get();
let left_diff = (left - percentage).abs();
let right_diff = (right - percentage).abs();
let left_diff = (left - value).abs();
let right_diff = (right - value).abs();

if left_diff <= right_diff {
update_value(percentage, right);
update_value(value, right);
} else {
update_value(left, percentage);
update_value(left, value);
}
};
};
Expand All @@ -166,7 +166,7 @@ pub fn RangeSlider(
let max = max.get_untracked();

let rail_rect = rail_el.get_bounding_client_rect();
let percentage = if vertical.get_untracked() {
let value = if vertical.get_untracked() {
let ev_y = f64::from(e.y());
let rail_y = rail_rect.y();
let rail_height = rail_rect.height();
Expand All @@ -179,7 +179,7 @@ pub fn RangeSlider(
rail_y + rail_height - ev_y
};

length / rail_height * (max - min)
length / rail_height * (max - min) + min
} else {
let ev_x = f64::from(e.x());
let rail_x = rail_rect.x();
Expand All @@ -193,14 +193,14 @@ pub fn RangeSlider(
ev_x - rail_x
};

length / rail_width * (max - min)
length / rail_width * (max - min) + min
};

if left_mousemove.get_value() {
update_value(percentage, current_value.get_untracked().1);
update_value(value, current_value.get_untracked().1);
return;
} else if right_mousemove.get_value() {
update_value(current_value.get_untracked().0, percentage);
update_value(current_value.get_untracked().0, value);
return;
}
}
Expand Down