From 5d12e194f45b4a01034f3f52fae16c10bc0192dd Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 29 Apr 2020 20:58:59 +0200
Subject: Rename `Cursor::*_position` methods in `canvas`
---
wgpu/src/widget/canvas/cursor.rs | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
(limited to 'wgpu/src/widget')
diff --git a/wgpu/src/widget/canvas/cursor.rs b/wgpu/src/widget/canvas/cursor.rs
index a559782a..7ab58b87 100644
--- a/wgpu/src/widget/canvas/cursor.rs
+++ b/wgpu/src/widget/canvas/cursor.rs
@@ -24,23 +24,23 @@ impl Cursor {
}
}
- pub fn relative_position(&self, bounds: &Rectangle) -> Option<Point> {
- match self {
- Cursor::Available(position) => {
- Some(Point::new(position.x - bounds.x, position.y - bounds.y))
- }
- _ => None,
- }
- }
-
- pub fn internal_position(&self, bounds: &Rectangle) -> Option<Point> {
+ pub fn position_in(&self, bounds: &Rectangle) -> Option<Point> {
if self.is_over(bounds) {
- self.relative_position(bounds)
+ self.position_from(bounds.position())
} else {
None
}
}
+ pub fn position_from(&self, origin: Point) -> Option<Point> {
+ match self {
+ Cursor::Available(position) => {
+ Some(Point::new(position.x - origin.x, position.y - origin.y))
+ }
+ Cursor::Unavailable => None,
+ }
+ }
+
pub fn is_over(&self, bounds: &Rectangle) -> bool {
match self {
Cursor::Available(position) => bounds.contains(*position),
--
cgit