mirrors/Magpie
2
0
Fork 0
mirror of https://github.com/Blinue/Magpie.git synced 2026-06-24 02:04:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: 支持源窗口中途置顶

Browse source
This commit is contained in:
Xu 2025-08-18 17:20:40 +08:00
commit 5e70774732
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Magpie.Core/ScalingWindow.cpp
View file

@ -693,6 +693,15 @@ LRESULT ScalingWindow::_MessageHandler(UINT msg, WPARAM wParam, LPARAM lParam) n
case WM_WINDOWPOSCHANGING:
{
WINDOWPOS& windowPos = *(WINDOWPOS*)lParam;
windowPos.flags |= SWP_NOOWNERZORDER;
if (!(windowPos.flags & SWP_NOZORDER)) {
if (_srcTracker.IsFocused()) {
windowPos.hwndInsertAfter = HWND_TOPMOST;
} else if (windowPos.hwndInsertAfter == HWND_TOPMOST) {
windowPos.hwndInsertAfter = HWND_NOTOPMOST;
}
}
// 如果全屏模式缩放包含 WS_MAXIMIZE 样式，创建窗口时将收到 WM_WINDOWPOSCHANGING，
// 应该忽略。

10
tools/WindowCase/TopmostWindow.cpp
View file

@ -46,7 +46,7 @@ LRESULT TopmostWindow::_MessageHandler(UINT msg, WPARAM wParam, LPARAM lParam) n
const LRESULT ret = base_type::_MessageHandler(msg, wParam, lParam);
const HMODULE hInst = GetModuleHandle(nullptr);
_hwndBtn = CreateWindow(L"BUTTON", L"置顶",
_hwndBtn = CreateWindow(L"BUTTON", L"未置顶",
WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, Handle(), (HMENU)1, hInst, 0);
_UpdateButtonPos();
@ -80,10 +80,14 @@ LRESULT TopmostWindow::_MessageHandler(UINT msg, WPARAM wParam, LPARAM lParam) n
if (HIWORD(wParam) == BN_CLICKED && LOWORD(wParam) == 1) {
if (GetWindowExStyle(Handle()) & WS_EX_TOPMOST){
SetWindowPos(Handle(), HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
SetWindowText(_hwndBtn, L"置顶");
} else {
SetWindowPos(Handle(), HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
SetWindowText(_hwndBtn, L"取消置顶");
}
if (GetWindowExStyle(Handle()) & WS_EX_TOPMOST) {
SetWindowText(_hwndBtn, L"已置顶");
} else {
SetWindowText(_hwndBtn, L"未置顶");
}
}
break;