alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-24 22:31:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Remove confusingly named event import alias

Browse source
This commit is contained in:
mitchmindtree 2017-02-05 20:41:26 +11:00
parent ba71f6fb77
commit 24b44e3b8e
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/platform/macos/window.rs
View file

@ -1,4 +1,4 @@
use {CreationError, WindowEvent as Event, MouseCursor, CursorState}; use {CreationError, Event, WindowEvent, WindowId, MouseCursor, CursorState};
use CreationError::OsError; use CreationError::OsError;
use libc; use libc;
@ -49,10 +49,10 @@ impl WindowDelegate {
// are called as the delegate methods should only be called during a call to // are called as the delegate methods should only be called during a call to
// `nextEventMatchingMask` (called via EventsLoop::poll_events and // `nextEventMatchingMask` (called via EventsLoop::poll_events and
// EventsLoop::run_forever). // EventsLoop::run_forever).
unsafe fn emit_event(state: &mut DelegateState, window_event: Event) { unsafe fn emit_event(state: &mut DelegateState, window_event: WindowEvent) {
let window_id = get_window_id(*state.window); let window_id = get_window_id(*state.window);
let event = ::Event::WindowEvent { let event = Event::WindowEvent {
window_id: ::WindowId(window_id), window_id: WindowId(window_id),
event: window_event, event: window_event,
}; };
@ -65,7 +65,7 @@ impl WindowDelegate {
unsafe { unsafe {
let state: *mut c_void = *this.get_ivar("winitState"); let state: *mut c_void = *this.get_ivar("winitState");
let state = &mut *(state as *mut DelegateState); let state = &mut *(state as *mut DelegateState);
emit_event(state, Event::Closed); emit_event(state, WindowEvent::Closed);
} }
YES YES
} }
@ -78,7 +78,7 @@ impl WindowDelegate {
let scale_factor = NSWindow::backingScaleFactor(*state.window) as f32; let scale_factor = NSWindow::backingScaleFactor(*state.window) as f32;
let width = (scale_factor * rect.size.width as f32) as u32; let width = (scale_factor * rect.size.width as f32) as u32;
let height = (scale_factor * rect.size.height as f32) as u32; let height = (scale_factor * rect.size.height as f32) as u32;
emit_event(state, Event::Resized(width, height)); emit_event(state, WindowEvent::Resized(width, height));
} }
} }
@ -88,7 +88,7 @@ impl WindowDelegate {
// lost focus // lost focus
let state: *mut c_void = *this.get_ivar("winitState"); let state: *mut c_void = *this.get_ivar("winitState");
let state = &mut *(state as *mut DelegateState); let state = &mut *(state as *mut DelegateState);
emit_event(state, Event::Focused(true)); emit_event(state, WindowEvent::Focused(true));
} }
} }
@ -96,7 +96,7 @@ impl WindowDelegate {
unsafe { unsafe {
let state: *mut c_void = *this.get_ivar("winitState"); let state: *mut c_void = *this.get_ivar("winitState");
let state = &mut *(state as *mut DelegateState); let state = &mut *(state as *mut DelegateState);
emit_event(state, Event::Focused(false)); emit_event(state, WindowEvent::Focused(false));
} }
} }