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

Move available_monitors and primary_monitor to EventLoopWindowTarget (#1616)

Browse source
This commit is contained in:
Xavier L'Heureux 2020-07-04 15:46:41 -04:00 • committed by GitHub
parent dd866a74a6
commit 3d5d05eac7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 121 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/platform_impl/windows/event_loop.rs
View file

@ -4,6 +4,7 @@ mod runner;
use parking_lot::Mutex;
use std::{
collections::VecDeque,
marker::PhantomData,
mem, panic, ptr,
rc::Rc,
@ -38,7 +39,8 @@ use crate::{
dpi::{become_dpi_aware, dpi_to_scale_factor, enable_non_client_dpi_scaling},
drop_handler::FileDropHandler,
event::{self, handle_extended_keys, process_key_params, vkey_to_winit_vkey},
monitor, raw_input, util,
monitor::{self, MonitorHandle},
raw_input, util,
window_state::{CursorFlags, WindowFlags, WindowState},
wrap_device_id, WindowId, DEVICE_ID,
},
@ -247,6 +249,15 @@ impl<T> EventLoopWindowTarget<T> {
target_window: self.thread_msg_target,
}
}
// TODO: Investigate opportunities for caching
pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
monitor::available_monitors()
}
pub fn primary_monitor(&self) -> MonitorHandle {
monitor::primary_monitor()
}
}
fn main_thread_id() -> DWORD {
@ -851,7 +862,7 @@ unsafe extern "system" fn public_window_callback<T: 'static>(
window_pos.cy = new_monitor_rect.bottom - new_monitor_rect.top;
}
*fullscreen_monitor = crate::monitor::MonitorHandle {
inner: monitor::MonitorHandle::new(new_monitor),
inner: MonitorHandle::new(new_monitor),
};
}
}