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

Get rid of FullScreenState::get_monitor()

Browse source
This commit is contained in:
Pedro Côrte-Real 2017-08-29 02:08:12 +01:00
parent b3ef9c8b22
commit 60b575a7c1
5 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/platform/windows/window.rs
View file

@ -21,6 +21,7 @@ use CursorState;
use MouseCursor;
use WindowAttributes;
use FullScreenState;
use MonitorId as RootMonitorId;
use dwmapi;
use kernel32;
@ -328,12 +329,13 @@ unsafe fn init(window: WindowAttributes, pl_attribs: PlatformSpecificWindowBuild
// switching to fullscreen if necessary
// this means adjusting the window's position so that it overlaps the right monitor,
// and change the monitor's resolution if necessary
if let Some(ref monitor) = window.fullscreen.get_monitor() {
let fullscreen = if let FullScreenState::Exclusive(RootMonitorId(ref monitor)) = window.fullscreen {
try!(switch_to_fullscreen(&mut rect, monitor));
true
} else {
false
};
let fullscreen = window.fullscreen.get_monitor().is_some();
// computing the style and extended style of the window
let (ex_style, style) = if fullscreen || !window.decorations {
(winapi::WS_EX_APPWINDOW,