Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-03 17:56:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FancyZones]Fix snap by hotkey for single-zone layouts (#22373)

Browse Source 
* unsnap window from previous work area when snapping by hotkey
This commit is contained in:
Seraphima Zykova
2022-12-02 13:29:11 +03:00
committed by GitHub
parent a7bd0cfde8
commit eca77ad8b3
5 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/fancyzones/FancyZonesLib/FancyZones.cpp
View File

@@ -808,6 +808,15 @@ bool FancyZones::OnSnapHotkeyBasedOnZoneNumber(HWND window, DWORD vkCode) noexce
auto workArea = m_workAreaHandler.GetWorkArea(VirtualDesktop::instance().GetCurrentVirtualDesktopId(), *currMonitorInfo);
if (m_windowMoveHandler.MoveWindowIntoZoneByDirectionAndIndex(window, vkCode, false /* cycle through zones */, workArea))
{
// unassign from previous work area
for (auto& prevWorkArea : m_workAreaHandler.GetAllWorkAreas())
{
if (workArea != prevWorkArea)
{
prevWorkArea->UnsnapWindow(window);
}
}
Trace::FancyZones::KeyboardSnapWindowToZone(workArea->GetLayout().get(), workArea->GetLayoutWindows().get());
return true;
}

8
src/modules/fancyzones/FancyZonesLib/WindowMoveHandler.cpp
View File

@@ -134,11 +134,7 @@ void WindowMoveHandler::MoveSizeStart(HWND window, HMONITOR monitor, POINT const
auto workArea = workAreaMap.find(monitor);
if (workArea != workAreaMap.end())
{
const auto& layoutWindows = workArea->second->GetLayoutWindows();
if (layoutWindows)
{
layoutWindows->Dismiss(window);
}
workArea->second->UnsnapWindow(window);
}
}
@@ -289,6 +285,8 @@ void WindowMoveHandler::MoveSizeEnd(HWND window, const std::unordered_map<HMONIT
AppZoneHistory::instance().RemoveAppLastZone(window, workAreaPtr->UniqueId(), guidStr.value());
}
}
workAreaPtr->UnsnapWindow(window);
}
}

16
src/modules/fancyzones/FancyZonesLib/WorkArea.cpp
View File

@@ -462,6 +462,22 @@ void WorkArea::SaveWindowProcessToZoneIndex(HWND window) noexcept
}
}
bool WorkArea::UnsnapWindow(HWND window) noexcept
{
if (!m_layoutWindows)
{
return false;
}
if (!m_layoutWindows->GetZoneIndexSetFromWindow(window).empty())
{
m_layoutWindows->Dismiss(window);
return true;
}
return false;
}
ZoneIndexSet WorkArea::GetWindowZoneIndexes(HWND window) const noexcept
{
if (m_layout)

1
src/modules/fancyzones/FancyZonesLib/WorkArea.h
View File

@@ -69,6 +69,7 @@ public:
bool MoveWindowIntoZoneByDirectionAndPosition(HWND window, DWORD vkCode, bool cycle) noexcept;
bool ExtendWindowByDirectionAndPosition(HWND window, DWORD vkCode) noexcept;
void SaveWindowProcessToZoneIndex(HWND window) noexcept;
bool UnsnapWindow(HWND window) noexcept;
void UpdateActiveZoneSet() noexcept;