alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2025-01-26 03:36:32 +11:00
Code Issues Projects Releases Packages Wiki Activity

Windows: Fix alt tab bordless fullscreen (#1740)

Browse source
This commit is contained in:
Alex Butler 2020-10-19 15:15:23 +01:00 • committed by GitHub
parent ee3996cac6
commit 7c543a43a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -1,6 +1,7 @@
# Unreleased # Unreleased
- On Android, calling `WindowEvent::Focused` now works properly instead of always returning false. - On Android, calling `WindowEvent::Focused` now works properly instead of always returning false.
- On Windows, fix alt-tab behaviour by removing borderless fullscreen "always on top" flag.
- On Windows, fix bug preventing windows with transparency enabled from having fully-opaque regions. - On Windows, fix bug preventing windows with transparency enabled from having fully-opaque regions.
# 0.23.0 (2020-10-02) # 0.23.0 (2020-10-02)

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

@ -489,7 +489,14 @@ impl Window {
// Update window style // Update window style
WindowState::set_window_flags(window_state_lock, window.0, |f| { WindowState::set_window_flags(window_state_lock, window.0, |f| {
f.set(WindowFlags::MARKER_FULLSCREEN, fullscreen.is_some()) f.set(
WindowFlags::MARKER_EXCLUSIVE_FULLSCREEN,
matches!(fullscreen, Some(Fullscreen::Exclusive(_))),
);
f.set(
WindowFlags::MARKER_BORDERLESS_FULLSCREEN,
matches!(fullscreen, Some(Fullscreen::Borderless(_))),
);
}); });
// Update window bounds // Update window bounds

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

@ -71,7 +71,8 @@ bitflags! {
/// Marker flag for fullscreen. Should always match `WindowState::fullscreen`, but is /// Marker flag for fullscreen. Should always match `WindowState::fullscreen`, but is
/// included here to make masking easier. /// included here to make masking easier.
const MARKER_FULLSCREEN = 1 << 9; const MARKER_EXCLUSIVE_FULLSCREEN = 1 << 9;
const MARKER_BORDERLESS_FULLSCREEN = 1 << 13;
/// The `WM_SIZE` event contains some parameters that can effect the state of `WindowFlags`. /// The `WM_SIZE` event contains some parameters that can effect the state of `WindowFlags`.
/// In most cases, it's okay to let those parameters change the state. However, when we're /// In most cases, it's okay to let those parameters change the state. However, when we're
@ -89,7 +90,7 @@ bitflags! {
WindowFlags::RESIZABLE.bits | WindowFlags::RESIZABLE.bits |
WindowFlags::MAXIMIZED.bits WindowFlags::MAXIMIZED.bits
); );
const FULLSCREEN_OR_MASK = WindowFlags::ALWAYS_ON_TOP.bits; const EXCLUSIVE_FULLSCREEN_OR_MASK = WindowFlags::ALWAYS_ON_TOP.bits;
const NO_DECORATIONS_AND_MASK = !WindowFlags::RESIZABLE.bits; const NO_DECORATIONS_AND_MASK = !WindowFlags::RESIZABLE.bits;
const INVISIBLE_AND_MASK = !WindowFlags::MAXIMIZED.bits; const INVISIBLE_AND_MASK = !WindowFlags::MAXIMIZED.bits;
} }
@ -176,9 +177,11 @@ impl MouseProperties {
impl WindowFlags { impl WindowFlags {
fn mask(mut self) -> WindowFlags { fn mask(mut self) -> WindowFlags {
if self.contains(WindowFlags::MARKER_FULLSCREEN) { if self.contains(WindowFlags::MARKER_EXCLUSIVE_FULLSCREEN) {
self &= WindowFlags::FULLSCREEN_AND_MASK;
self |= WindowFlags::EXCLUSIVE_FULLSCREEN_OR_MASK;
} else if self.contains(WindowFlags::MARKER_BORDERLESS_FULLSCREEN) {
self &= WindowFlags::FULLSCREEN_AND_MASK; self &= WindowFlags::FULLSCREEN_AND_MASK;
self |= WindowFlags::FULLSCREEN_OR_MASK;
} }
if !self.contains(WindowFlags::VISIBLE) { if !self.contains(WindowFlags::VISIBLE) {
self &= WindowFlags::INVISIBLE_AND_MASK; self &= WindowFlags::INVISIBLE_AND_MASK;
@ -319,7 +322,9 @@ impl WindowFlags {
// We generally don't want style changes here to affect window // We generally don't want style changes here to affect window
// focus, but for fullscreen windows they must be activated // focus, but for fullscreen windows they must be activated
// (i.e. focused) so that they appear on top of the taskbar // (i.e. focused) so that they appear on top of the taskbar
if !new.contains(WindowFlags::MARKER_FULLSCREEN) { if !new.contains(WindowFlags::MARKER_EXCLUSIVE_FULLSCREEN)
&& !new.contains(WindowFlags::MARKER_BORDERLESS_FULLSCREEN)
{
flags |= winuser::SWP_NOACTIVATE; flags |= winuser::SWP_NOACTIVATE;
} }