mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-06-08 01:52:52 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

[AlwaysOnTop] fix remaining border after window closing (#16268)

Browse Source
This commit is contained in:
Seraphima Zykova 2022-02-16 17:00:05 +03:00 committed by GitHub
parent d744ca33b6
commit 03b7cb4690
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,12 +247,11 @@ void AlwaysOnTop::RegisterHotkey() const
void AlwaysOnTop::SubscribeToEvents() void AlwaysOnTop::SubscribeToEvents()
{ {
// subscribe to windows events // subscribe to windows events
std::array<DWORD, 6> events_to_subscribe = { std::array<DWORD, 5> events_to_subscribe = {
EVENT_OBJECT_LOCATIONCHANGE, EVENT_OBJECT_LOCATIONCHANGE,
EVENT_SYSTEM_MINIMIZESTART, EVENT_SYSTEM_MINIMIZESTART,
EVENT_SYSTEM_MINIMIZEEND, EVENT_SYSTEM_MINIMIZEEND,
EVENT_SYSTEM_MOVESIZEEND, EVENT_SYSTEM_MOVESIZEEND,
EVENT_OBJECT_DESTROY,
EVENT_OBJECT_NAMECHANGE EVENT_OBJECT_NAMECHANGE
}; };
@ -330,11 +329,29 @@ bool AlwaysOnTop::IsTracked(HWND window) const noexcept
void AlwaysOnTop::HandleWinHookEvent(WinHookEvent* data) noexcept void AlwaysOnTop::HandleWinHookEvent(WinHookEvent* data) noexcept
{ {
if (!AlwaysOnTopSettings::settings().enableFrame) if (!AlwaysOnTopSettings::settings().enableFrame || !data->hwnd)
{ {
return; 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)
{
bool visible = IsWindowVisible(window);
if (!visible)
{
UnpinTopmostWindow(window);
toErase.push_back(window);
}
}
for (const auto window : toErase)
{
m_topmostWindows.erase(window);
}
switch (data->event) switch (data->event)
{ {
case EVENT_OBJECT_LOCATIONCHANGE: case EVENT_OBJECT_LOCATIONCHANGE:
@ -381,15 +398,6 @@ void AlwaysOnTop::HandleWinHookEvent(WinHookEvent* data) noexcept
} }
} }
break; break;
case EVENT_OBJECT_DESTROY:
{
auto iter = m_topmostWindows.find(data->hwnd);
if (iter != m_topmostWindows.end())
{
m_topmostWindows.erase(iter);
}
}
break;
case EVENT_OBJECT_NAMECHANGE: case EVENT_OBJECT_NAMECHANGE:
{ {
// The accessibility name of the desktop window changes whenever the user // The accessibility name of the desktop window changes whenever the user