leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

macOS: Fix Window::get_current_monitor (#521)

Browse source 
* macOS: Implement MonitorId::get_position

* macOS: Fix Window::get_current_monitor
This commit is contained in:
Francesca Frangipane 2018-05-16 09:41:45 -04:00 • committed by GitHub
parent 87fa120ebb
commit 2464a135b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -326,7 +326,7 @@ impl WindowDelegate {
unsafe {
let state: *mut c_void = *this.get_ivar("winitState");
let state = &mut *(state as *mut DelegateState);
state.win_attribs.borrow_mut().fullscreen = Some(get_current_monitor());
state.win_attribs.borrow_mut().fullscreen = Some(get_current_monitor(*state.window));
state.handle_with_fullscreen = false;
}
@ -499,18 +499,13 @@ pub struct Window2 {
unsafe impl Send for Window2 {}
unsafe impl Sync for Window2 {}
/// Helpper funciton to convert NSScreen::mainScreen to MonitorId
unsafe fn get_current_monitor() -> RootMonitorId {
let screen = NSScreen::mainScreen(nil);
unsafe fn get_current_monitor(window: id) -> RootMonitorId {
let screen: id = msg_send![window, screen];
let desc = NSScreen::deviceDescription(screen);
let key = IdRef::new(NSString::alloc(nil).init_str("NSScreenNumber"));
let value = NSDictionary::valueForKey_(desc, *key);
let display_id = msg_send![value, unsignedIntegerValue];
RootMonitorId {
inner: EventsLoop::make_monitor_from_display(display_id),
}
RootMonitorId { inner: EventsLoop::make_monitor_from_display(display_id) }
}
impl Drop for Window2 {
@ -637,7 +632,7 @@ impl Window2 {
// Set fullscreen mode after we setup everything
if let Some(ref monitor) = win_attribs.fullscreen {
unsafe {
if monitor.inner != get_current_monitor().inner {
if monitor.inner != get_current_monitor(*window.window).inner {
unimplemented!();
}
}
@ -1082,7 +1077,7 @@ impl Window2 {
#[inline]
pub fn get_current_monitor(&self) -> RootMonitorId {
unsafe {
self::get_current_monitor()
self::get_current_monitor(*self.window)
}
}
}