Merge branch 'master' of github.com:tomaka/glutin into x11_window_size_constraints

examples/grabbing.rs

@@ -35,7 +35,7 @@ fn main() {
 
             Event::Closed => break,
 
-            a @ Event::MouseMoved(_) => {
+            a @ Event::MouseMoved(_, _) => {
                 println!("{:?}", a);
             },
 

src/api/cocoa/mod.rs

@@ -848,8 +848,8 @@ unsafe fn NSEventToEvent(window: &Window, nsevent: id) -> Option<Event> {
             let view_rect = NSView::frame(*window.view);
             let scale_factor = window.hidpi_factor();
 
-            Some(MouseMoved(((scale_factor * view_point.x as f32) as i32,
-                            (scale_factor * (view_rect.size.height - view_point.y) as f32) as i32)))
+            Some(MouseMoved((scale_factor * view_point.x as f32) as i32,
+                            (scale_factor * (view_rect.size.height - view_point.y) as f32) as i32))
         },
         NSKeyDown => {
             let mut events = VecDeque::new();

src/api/wayland/events.rs

@@ -52,7 +52,7 @@ pub fn translate_event(
                 if known_surfaces.contains(&surface) {
                     focuses.pointer_on = Some(surface);
                     focuses.pointer_at = Some((x, y));
-                    Some((GlutinEvent::MouseMoved((x as i32, y as i32)), surface))
+                    Some((GlutinEvent::MouseMoved(x as i32, y as i32), surface))
                 } else {
                     None
                 }
@@ -65,7 +65,7 @@ pub fn translate_event(
             WlPointerEvent::Motion(_, x, y) => {
                 if let Some(surface) = focuses.pointer_on {
                     focuses.pointer_at = Some((x, y));
-                    Some((GlutinEvent::MouseMoved((x as i32, y as i32)), surface))
+                    Some((GlutinEvent::MouseMoved(x as i32, y as i32), surface))
                 } else {
                     None
                 }

src/api/win32/callback.rs

@@ -126,7 +126,7 @@ pub unsafe extern "system" fn callback(window: winapi::HWND, msg: winapi::UINT,
             let x = winapi::GET_X_LPARAM(lparam) as i32;
             let y = winapi::GET_Y_LPARAM(lparam) as i32;
 
-            send_event(window, MouseMoved((x, y)));
+            send_event(window, MouseMoved(x, y));
 
             0
         },

src/api/x11/input.rs

@@ -241,7 +241,7 @@ impl XInputEventHandler {
                     let new_cursor_pos = (event_data.event_x, event_data.event_y);
                     if new_cursor_pos != self.current_state.cursor_pos {
                         self.current_state.cursor_pos = new_cursor_pos;
-                        Some(MouseMoved((new_cursor_pos.0 as i32, new_cursor_pos.1 as i32)))
+                        Some(MouseMoved(new_cursor_pos.0 as i32, new_cursor_pos.1 as i32))
                     } else {
                         None
                     }

src/events.rs

@@ -28,7 +28,7 @@ pub enum Event {
     /// The cursor has moved on the window.
     ///
     /// The parameter are the (x,y) coords in pixels relative to the top-left corner of the window.
-    MouseMoved((i32, i32)),
+    MouseMoved(i32, i32),
 
     /// A mouse wheel movement or touchpad scroll occurred.
     MouseWheel(MouseScrollDelta, TouchPhase),