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

On Windows, fix set_fullscreen early return for Fullscreen::Borderless(None)

Browse source
This commit is contained in:
Amr Bashir 2023-12-16 18:34:18 +02:00 • committed by GitHub
parent bf5806a9b2
commit 7f6b16a6af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/platform_impl/windows/window.rs
View file

@ -686,9 +686,19 @@ impl Window {
let mut window_state_lock = window_state.lock().unwrap();
let old_fullscreen = window_state_lock.fullscreen.clone();
if window_state_lock.fullscreen == fullscreen {
return;
match (&old_fullscreen, &fullscreen) {
// Return if we already are in the same fullscreen mode
_ if old_fullscreen == fullscreen => return,
// Return if saved Borderless(monitor) is the same as current monitor when requested fullscreen is Borderless(None)
(Some(Fullscreen::Borderless(Some(monitor))), Some(Fullscreen::Borderless(None)))
if *monitor == monitor::current_monitor(window.0) =>
{
return
}
_ => {}
}
window_state_lock.fullscreen = fullscreen.clone();
drop(window_state_lock);