Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

[AlwaysOnTop] Return topmost if it was lost (#21297)

Browse Source
This commit is contained in:
Seraphima Zykova
2022-10-21 18:56:51 +02:00
committed by GitHub
parent 9c21e2dc14
commit 4da866aaa3
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.cpp
View File

@@ -312,13 +312,14 @@ void AlwaysOnTop::RegisterLLKH()
void AlwaysOnTop::SubscribeToEvents()
{
// subscribe to windows events
std::array<DWORD, 6> events_to_subscribe = {
std::array<DWORD, 7> events_to_subscribe = {
EVENT_OBJECT_LOCATIONCHANGE,
EVENT_SYSTEM_MINIMIZESTART,
EVENT_SYSTEM_MINIMIZEEND,
EVENT_SYSTEM_MOVESIZEEND,
EVENT_SYSTEM_FOREGROUND,
EVENT_OBJECT_DESTROY
EVENT_OBJECT_DESTROY,
EVENT_OBJECT_FOCUS,
};
for (const auto event : events_to_subscribe)
@@ -413,11 +414,11 @@ void AlwaysOnTop::HandleWinHookEvent(WinHookEvent* data) noexcept
return;
}
// fix for the https://github.com/microsoft/PowerToys/issues/15300
// check if the window was closed, since for some EVENT_OBJECT_DESTROY doesn't work
std::vector<HWND> toErase{};
for (const auto& [window, border] : m_topmostWindows)
{
// check if the window was closed, since for some EVENT_OBJECT_DESTROY doesn't work
// fixes https://github.com/microsoft/PowerToys/issues/15300
bool visible = IsWindowVisible(window);
if (!visible)
{
@@ -484,6 +485,20 @@ void AlwaysOnTop::HandleWinHookEvent(WinHookEvent* data) noexcept
RefreshBorders();
}
break;
case EVENT_OBJECT_FOCUS:
{
for (const auto& [window, border] : m_topmostWindows)
{
// check if topmost was reset
// fixes https://github.com/microsoft/PowerToys/issues/19168
if (!IsTopmost(window))
{
Logger::trace(L"A window no longer has Topmost set and it should. Setting topmost again.");
PinTopmostWindow(window);
}
}
}
break;
default:
break;
}