migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-30 13:20:05 -04:00
Code Activity

Use ..= range arguments to remap functions

Browse Source
This commit is contained in:
Emil Ernerfeldt
2020-04-25 11:11:44 +02:00
parent 663fbda90c
commit 4cc6ca7236
6 changed files with 38 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
emigui/src/widgets.rs
View File

@@ -457,13 +457,12 @@ impl<'a> Widget for Slider<'a> {
let left = interact.rect.left() + handle_radius;
let right = interact.rect.right() - handle_radius;
let min = *self.range.start();
let max = *self.range.end();
debug_assert!(min <= max);
let range = self.range.clone();
debug_assert!(range.start() <= range.end());
if let Some(mouse_pos) = region.input().mouse_pos {
if interact.active {
self.set_value_f32(remap_clamp(mouse_pos.x, left, right, min, max));
self.set_value_f32(remap_clamp(mouse_pos.x, left..=right, range.clone()));
}
}
@@ -477,7 +476,7 @@ impl<'a> Widget for Slider<'a> {
pos2(interact.rect.left(), rect.center().y - rail_radius),
pos2(interact.rect.right(), rect.center().y + rail_radius),
);
let marker_center_x = remap_clamp(value, min, max, left, right);
let marker_center_x = remap_clamp(value, range, left..=right);
region.add_paint_cmd(PaintCmd::Rect {
rect: rail_rect,