Skip to content

fix: ensure window type is always set when using WS_EX_TOPMOST #4659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TechnoPorg wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −3
Open

fix: ensure window type is always set when using WS_EX_TOPMOST #4659

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions winit-win32/src/window_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,6 @@ impl WindowFlags {
if self.contains(WindowFlags::ON_TASKBAR) {
style_ex |= WS_EX_APPWINDOW;
}
if self.contains(WindowFlags::ALWAYS_ON_TOP) {
style_ex |= WS_EX_TOPMOST;
}
if self.contains(WindowFlags::NO_BACK_BUFFER) {
style_ex |= WS_EX_NOREDIRECTIONBITMAP;
}
Expand Down Expand Up @@ -338,6 +335,19 @@ impl WindowFlags {
style &= !WS_OVERLAPPEDWINDOW;
}

if self.contains(WindowFlags::ALWAYS_ON_TOP) {
style_ex |= WS_EX_TOPMOST;

// A window with WS_EX_TOPMOST set must have one of the following style flags:
// WS_BORDER, WS_CAPTION, WS_SYSMENU, WS_MAXIMIZEBOX, WS_MINIMIZEBOX, WS_THICKFRAME,
// WS_EX_CLIENTEDGE, WS_EX_CONTEXTHELP, WS_EX_DLGMODALFRAME, WS_EX_TOOLWINDOW,
// WS_EX_WINDOWEDGE.
// If none of them are set, it will cause a DXGI error when creating a swapchain.
if style & WS_CAPTION == 0 {
style |= WS_POPUP;
}
}

(style, style_ex)
}

Expand Down
Loading