diff options
Diffstat (limited to 'components')
| -rw-r--r-- | components/compositing/compositor.rs | 6 | ||||
| -rw-r--r-- | components/compositing/compositor_layer.rs | 6 | ||||
| -rw-r--r-- | components/compositing/windowing.rs | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index b4dd37a2915..40d0f56dfa7 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -797,9 +797,9 @@ impl<Window: WindowMethods> IOCompositor<Window> { fn on_mouse_window_event_class(&self, mouse_window_event: MouseWindowEvent) { let point = match mouse_window_event { - MouseWindowEvent::MouseWindowClickEvent(_, p) => p, - MouseWindowEvent::MouseWindowMouseDownEvent(_, p) => p, - MouseWindowEvent::MouseWindowMouseUpEvent(_, p) => p, + MouseWindowEvent::Click(_, p) => p, + MouseWindowEvent::MouseDown(_, p) => p, + MouseWindowEvent::MouseUp(_, p) => p, }; match self.find_topmost_layer_at_point(point / self.scene.scale) { Some(result) => result.layer.send_mouse_event(mouse_window_event, result.point), diff --git a/components/compositing/compositor_layer.rs b/components/compositing/compositor_layer.rs index 3658172847e..665e786d262 100644 --- a/components/compositing/compositor_layer.rs +++ b/components/compositing/compositor_layer.rs @@ -318,11 +318,11 @@ impl CompositorLayer for Layer<CompositorData> { cursor: TypedPoint2D<LayerPixel, f32>) { let event_point = cursor.to_untyped(); let message = match event { - MouseWindowEvent::MouseWindowClickEvent(button, _) => + MouseWindowEvent::Click(button, _) => ClickEvent(button, event_point), - MouseWindowEvent::MouseWindowMouseDownEvent(button, _) => + MouseWindowEvent::MouseDown(button, _) => MouseDownEvent(button, event_point), - MouseWindowEvent::MouseWindowMouseUpEvent(button, _) => + MouseWindowEvent::MouseUp(button, _) => MouseUpEvent(button, event_point), }; let pipeline = &self.extra_data.borrow().pipeline; diff --git a/components/compositing/windowing.rs b/components/compositing/windowing.rs index 54fc96897d0..08a99aa2e03 100644 --- a/components/compositing/windowing.rs +++ b/components/compositing/windowing.rs @@ -19,9 +19,9 @@ use std::fmt::{FormatError, Formatter, Show}; use std::rc::Rc; pub enum MouseWindowEvent { - MouseWindowClickEvent(uint, TypedPoint2D<DevicePixel, f32>), - MouseWindowMouseDownEvent(uint, TypedPoint2D<DevicePixel, f32>), - MouseWindowMouseUpEvent(uint, TypedPoint2D<DevicePixel, f32>), + Click(uint, TypedPoint2D<DevicePixel, f32>), + MouseDown(uint, TypedPoint2D<DevicePixel, f32>), + MouseUp(uint, TypedPoint2D<DevicePixel, f32>), } pub enum WindowNavigateMsg { |