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

[FancyZones] Fix stuck chrome tab when merging into existing window (#6931)

Browse Source 
* Fix stuck Chrome tab when merging with existing window

* Rename struct fields
This commit is contained in:
stefansjfw 2020-10-01 15:38:24 +02:00 committed by GitHub
parent 8f81b9c662
commit 85f56f4ed8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/fancyzones/lib/WindowMoveHandler.cpp
View File

@ -67,8 +67,8 @@ void WindowMoveHandler::MoveSizeStart(HWND window, HMONITOR monitor, POINT const
return; return;
} }
m_moveSizeWindowInfo.noVisibleOwner = FancyZonesUtils::HasNoVisibleOwner(window); m_moveSizeWindowInfo.hasNoVisibleOwner = FancyZonesUtils::HasNoVisibleOwner(window);
m_moveSizeWindowInfo.standardWindow = FancyZonesUtils::IsStandardWindow(window); m_moveSizeWindowInfo.isStandardWindow = FancyZonesUtils::IsStandardWindow(window);
m_inMoveSize = true; m_inMoveSize = true;
auto iter = zoneWindowMap.find(monitor); auto iter = zoneWindowMap.find(monitor);
@ -209,11 +209,11 @@ void WindowMoveHandler::MoveSizeEnd(HWND window, POINT const& ptScreen, const st
auto zoneWindow = std::move(m_zoneWindowMoveSize); auto zoneWindow = std::move(m_zoneWindowMoveSize);
ResetWindowTransparency(); ResetWindowTransparency();
bool hasNoVisibleOwnoer = FancyZonesUtils::HasNoVisibleOwner(window); bool hasNoVisibleOwner = FancyZonesUtils::HasNoVisibleOwner(window);
bool isStandardWindow = FancyZonesUtils::IsStandardWindow(window); bool isStandardWindow = FancyZonesUtils::IsStandardWindow(window);
if ((isStandardWindow == false && hasNoVisibleOwnoer == false && if ((isStandardWindow == false && hasNoVisibleOwner == true &&
m_moveSizeWindowInfo.standardWindow == true && m_moveSizeWindowInfo.noVisibleOwner == true) || m_moveSizeWindowInfo.isStandardWindow == true && m_moveSizeWindowInfo.hasNoVisibleOwner == true) ||
FancyZonesUtils::IsWindowMaximized(window)) FancyZonesUtils::IsWindowMaximized(window))
{ {
// Abort the zoning, this is a Chromium based tab that is merged back with an existing window // Abort the zoning, this is a Chromium based tab that is merged back with an existing window

4
src/modules/fancyzones/lib/WindowMoveHandler.h
View File

@ -52,9 +52,9 @@ private:
struct MoveSizeWindowInfo struct MoveSizeWindowInfo
{ {
// True if from the styles the window looks like a standard window // True if from the styles the window looks like a standard window
bool standardWindow = false; bool isStandardWindow = false;
// True if the window is a top-level window that does not have a visible owner // True if the window is a top-level window that does not have a visible owner
bool noVisibleOwner = false; bool hasNoVisibleOwner = false;
}; };
void WarnIfElevationIsRequired(HWND window) noexcept; void WarnIfElevationIsRequired(HWND window) noexcept;