1
0
mirror of https://github.com/emilk/egui.git synced 2026-09-01 14:20:04 -04:00

Replace emath::clamp with f32::clamp (new in rustc 1.50)

This commit is contained in:
Emil Ernerfeldt
2021-03-21 17:47:03 +01:00
parent cdab9d777f
commit f5c372910c
16 changed files with 66 additions and 63 deletions

View File

@@ -1,11 +1,9 @@
use std::ops::{Add, AddAssign, Div, Mul, MulAssign, Neg, RangeInclusive, Sub, SubAssign};
use crate::*;
use std::ops::{Add, AddAssign, Div, Mul, MulAssign, Neg, Sub, SubAssign};
/// A vector has a direction and length.
/// A [`Vec2`] is often used to represent a size.
///
/// emath represents positions using [`Pos2`].
/// emath represents positions using [`crate::Pos2`].
///
/// Normally the units are points (logical pixels).
#[derive(Clone, Copy, Default, PartialEq)]
@@ -183,10 +181,10 @@ impl Vec2 {
}
#[must_use]
pub fn clamp(self, range: RangeInclusive<Self>) -> Self {
pub fn clamp(self, min: Self, max: Self) -> Self {
Self {
x: clamp(self.x, range.start().x..=range.end().x),
y: clamp(self.y, range.start().y..=range.end().y),
x: self.x.clamp(min.x, max.x),
y: self.y.clamp(min.y, max.y),
}
}
}