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

[macos] Emit a resize event when Window changes screens

Browse source
This commit is contained in:
mitchmindtree 2017-03-19 20:30:54 +11:00
parent 4656540417
commit cccc48b84d
1 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,12 +43,7 @@ impl WindowDelegate {
fn class() -> *const Class { fn class() -> *const Class {
use std::os::raw::c_void; use std::os::raw::c_void;
// Emits an event via the `EventsLoop`'s callback. // Emits an event via the `EventsLoop`'s callback or stores it in the pending queue.
//
// The `Eventloop`'s callback should always be `Some` while the `WindowDelegate`'s methods
// are called as the delegate methods should only be called during a call to
// `nextEventMatchingMask` (called via EventsLoop::poll_events and
// EventsLoop::run_forever).
unsafe fn emit_event(state: &mut DelegateState, window_event: WindowEvent) { 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 {
@ -61,6 +56,15 @@ impl WindowDelegate {
} }
} }
// Called when the window is resized or when the window was moved to a different screen.
unsafe fn emit_resize_event(state: &mut DelegateState) {
let rect = NSView::frame(*state.view);
let scale_factor = NSWindow::backingScaleFactor(*state.window) as f32;
let width = (scale_factor * rect.size.width as f32) as u32;
let height = (scale_factor * rect.size.height as f32) as u32;
emit_event(state, WindowEvent::Resized(width, height));
}
extern fn window_should_close(this: &Object, _: Sel, _: id) -> BOOL { extern fn window_should_close(this: &Object, _: Sel, _: id) -> BOOL {
unsafe { unsafe {
let state: *mut c_void = *this.get_ivar("winitState"); let state: *mut c_void = *this.get_ivar("winitState");
@ -80,11 +84,15 @@ 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);
let rect = NSView::frame(*state.view); emit_resize_event(state);
let scale_factor = NSWindow::backingScaleFactor(*state.window) as f32; }
let width = (scale_factor * rect.size.width as f32) as u32; }
let height = (scale_factor * rect.size.height as f32) as u32;
emit_event(state, WindowEvent::Resized(width, height)); extern fn window_did_change_screen(this: &Object, _: Sel, _: id) {
unsafe {
let state: *mut c_void = *this.get_ivar("winitState");
let state = &mut *(state as *mut DelegateState);
emit_resize_event(state);
} }
} }
@ -119,6 +127,8 @@ impl WindowDelegate {
window_should_close as extern fn(&Object, Sel, id) -> BOOL); window_should_close as extern fn(&Object, Sel, id) -> BOOL);
decl.add_method(sel!(windowDidResize:), decl.add_method(sel!(windowDidResize:),
window_did_resize as extern fn(&Object, Sel, id)); window_did_resize as extern fn(&Object, Sel, id));
decl.add_method(sel!(windowDidChangeScreen:),
window_did_change_screen as extern fn(&Object, Sel, id));
decl.add_method(sel!(windowDidBecomeKey:), decl.add_method(sel!(windowDidBecomeKey:),
window_did_become_key as extern fn(&Object, Sel, id)); window_did_become_key as extern fn(&Object, Sel, id));