Update euclid to 0.18

This commit is contained in:
Bastien Orivel 2018-07-18 09:27:07 +02:00
parent 88664912ed
commit 9e446971a8
27 changed files with 78 additions and 82 deletions

View file

@ -15,7 +15,7 @@ default = []
[dependencies]
embedder_traits = {path = "../embedder_traits"}
euclid = "0.17"
euclid = "0.18"
gfx_traits = {path = "../gfx_traits"}
gleam = {version = "0.5", optional = true}
image = "0.19"

View file

@ -771,15 +771,12 @@ impl<Window: WindowMethods> IOCompositor<Window> {
fn on_touch_move(&mut self, identifier: TouchId, point: DevicePoint) {
match self.touch_handler.on_touch_move(identifier, point) {
TouchAction::Scroll(delta) => {
match point.cast() {
Some(point) => self.on_scroll_window_event(
ScrollLocation::Delta(
LayoutVector2D::from_untyped(&delta.to_untyped())
),
point
self.on_scroll_window_event(
ScrollLocation::Delta(
LayoutVector2D::from_untyped(&delta.to_untyped())
),
None => error!("Point cast failed."),
}
point.cast()
)
}
TouchAction::Zoom(magnification, scroll_delta) => {
let cursor = TypedPoint2D::new(-1, -1); // Make sure this hits the base layer.