mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-11-27 14:59:16 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

[FancyZones] Allow snapping apps launched by Workspaces (#35067)

Browse Source
This commit is contained in:
Seraphima Zykova 2024-09-25 19:36:36 +03:00 committed by GitHub
parent ad1f20408c
commit 471db8bf9c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 70 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -398,7 +398,7 @@ void FancyZones::WindowCreated(HWND window) noexcept
return;
}
if (!FancyZonesWindowProcessing::IsProcessable(window))
if (!FancyZonesWindowProcessing::IsProcessableAutomatically(window))
{
return;
}
@ -1084,7 +1084,7 @@ bool FancyZones::ShouldProcessSnapHotkey(DWORD vkCode) noexcept
}
auto window = GetForegroundWindow();
if (!FancyZonesWindowProcessing::IsProcessable(window))
if (!FancyZonesWindowProcessing::IsProcessableManually(window))
{
return false;
}

28
src/modules/fancyzones/FancyZonesLib/FancyZonesWindowProcessing.cpp
View File

@ -65,16 +65,28 @@ FancyZonesWindowProcessing::ProcessabilityType FancyZonesWindowProcessing::Defin
return ProcessabilityType::NotCurrentVirtualDesktop;
}
// Ignore windows launched by Workspaces
if (FancyZonesWindowProperties::IsLaunchedByWorkspaces(window))
{
return ProcessabilityType::LaunchedByWorkspaces;
}
return ProcessabilityType::Processable;
}
bool FancyZonesWindowProcessing::IsProcessable(HWND window) noexcept
bool FancyZonesWindowProcessing::IsProcessableAutomatically(HWND window) noexcept
{
return DefineWindowType(window) == ProcessabilityType::Processable;
auto type = DefineWindowType(window);
if (type != ProcessabilityType::Processable)
{
return false;
}
// Ignore windows launched by Workspaces
if (FancyZonesWindowProperties::IsLaunchedByWorkspaces(window))
{
return false;
}
return true;
}
bool FancyZonesWindowProcessing::IsProcessableManually(HWND window) noexcept
{
auto type = DefineWindowType(window);
return type == ProcessabilityType::Processable;
}

6
src/modules/fancyzones/FancyZonesLib/FancyZonesWindowProcessing.h
View File

@ -13,10 +13,10 @@ namespace FancyZonesWindowProcessing
NonProcessablePopupWindow,
ChildWindow,
Excluded,
NotCurrentVirtualDesktop,
LaunchedByWorkspaces
NotCurrentVirtualDesktop
};
ProcessabilityType DefineWindowType(HWND window) noexcept;
bool IsProcessable(HWND window) noexcept;
bool IsProcessableAutomatically(HWND window) noexcept;
bool IsProcessableManually(HWND window) noexcept;
}

2
src/modules/fancyzones/FancyZonesLib/WindowMouseSnap.cpp
View File

@ -29,7 +29,7 @@ WindowMouseSnap::~WindowMouseSnap()
std::unique_ptr<WindowMouseSnap> WindowMouseSnap::Create(HWND window, const std::unordered_map<HMONITOR, std::unique_ptr<WorkArea>>& activeWorkAreas)
{
if (FancyZonesWindowUtils::IsCursorTypeIndicatingSizeEvent() || !FancyZonesWindowProcessing::IsProcessable(window))
if (FancyZonesWindowUtils::IsCursorTypeIndicatingSizeEvent() || !FancyZonesWindowProcessing::IsProcessableManually(window))
{
return nullptr;
}

60
src/modules/fancyzones/FancyZonesTests/UnitTests/WindowProcessingTests.Spec.cpp
View File

@ -4,6 +4,8 @@
#include <FancyZonesLib/Settings.h>
#include <FancyZonesLib/WindowUtils.h>
#include <modules/Workspaces/WindowProperties/WorkspacesWindowPropertyUtils.h>
#include "Util.h"
#include <CppUnitTestLogger.h>
@ -45,7 +47,8 @@ namespace FancyZonesUnitTests
Assert::IsTrue(IsIconic(window));
Assert::AreEqual(FancyZonesWindowProcessing::ProcessabilityType::Minimized, FancyZonesWindowProcessing::DefineWindowType(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessable(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessableAutomatically(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessableManually(window));
}
TEST_METHOD (ToolWindow)
@ -53,7 +56,8 @@ namespace FancyZonesUnitTests
HWND window = Mocks::WindowCreate(hInst, L"", L"", WS_EX_TOOLWINDOW);
Assert::AreEqual(FancyZonesWindowProcessing::ProcessabilityType::ToolWindow, FancyZonesWindowProcessing::DefineWindowType(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessable(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessableAutomatically(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessableManually(window));
}
TEST_METHOD (InvisibleWindow)
@ -63,7 +67,8 @@ namespace FancyZonesUnitTests
std::this_thread::sleep_for(std::chrono::milliseconds(100)); // let ShowWindow finish
Assert::AreEqual(FancyZonesWindowProcessing::ProcessabilityType::NotVisible, FancyZonesWindowProcessing::DefineWindowType(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessable(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessableAutomatically(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessableManually(window));
}
TEST_METHOD(NonRootWindow)
@ -75,7 +80,8 @@ namespace FancyZonesUnitTests
Assert::IsFalse(FancyZonesWindowUtils::IsRoot(window));
Assert::AreEqual(FancyZonesWindowProcessing::ProcessabilityType::NonRootWindow, FancyZonesWindowProcessing::DefineWindowType(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessable(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessableAutomatically(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessableManually(window));
}
TEST_METHOD (Popup_App)
@ -83,7 +89,8 @@ namespace FancyZonesUnitTests
HWND window = Mocks::WindowCreate(hInst, L"", L"", 0, WS_TILEDWINDOW | WS_POPUP);
Assert::AreEqual(FancyZonesWindowProcessing::ProcessabilityType::Processable, FancyZonesWindowProcessing::DefineWindowType(window));
Assert::IsTrue(FancyZonesWindowProcessing::IsProcessable(window));
Assert::IsTrue(FancyZonesWindowProcessing::IsProcessableAutomatically(window));
Assert::IsTrue(FancyZonesWindowProcessing::IsProcessableManually(window));
}
TEST_METHOD (Popup_Menu)
@ -91,7 +98,8 @@ namespace FancyZonesUnitTests
HWND window = Mocks::WindowCreate(hInst, L"", L"", 0, WS_POPUP | WS_TILED | WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
Assert::AreEqual(FancyZonesWindowProcessing::ProcessabilityType::NonProcessablePopupWindow, FancyZonesWindowProcessing::DefineWindowType(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessable(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessableAutomatically(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessableManually(window));
}
TEST_METHOD (Popup_MenuEdge)
@ -99,7 +107,8 @@ namespace FancyZonesUnitTests
HWND window = Mocks::WindowCreate(hInst, L"", L"", 0, WS_POPUP | WS_TILED | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_THICKFRAME | WS_SIZEBOX);
Assert::AreEqual(FancyZonesWindowProcessing::ProcessabilityType::NonProcessablePopupWindow, FancyZonesWindowProcessing::DefineWindowType(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessable(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessableAutomatically(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessableManually(window));
}
TEST_METHOD (Popup_Calculator)
@ -107,7 +116,8 @@ namespace FancyZonesUnitTests
HWND window = Mocks::WindowCreate(hInst, L"", L"", 0, WS_BORDER | WS_CLIPSIBLINGS | WS_DLGFRAME | WS_GROUP | WS_POPUP | WS_POPUPWINDOW | WS_SIZEBOX | WS_TABSTOP | WS_TILEDWINDOW);
Assert::AreEqual(FancyZonesWindowProcessing::ProcessabilityType::Processable, FancyZonesWindowProcessing::DefineWindowType(window));
Assert::IsTrue(FancyZonesWindowProcessing::IsProcessable(window));
Assert::IsTrue(FancyZonesWindowProcessing::IsProcessableAutomatically(window));
Assert::IsTrue(FancyZonesWindowProcessing::IsProcessableManually(window));
}
TEST_METHOD (Popup_CalculatorTopmost)
@ -115,7 +125,8 @@ namespace FancyZonesUnitTests
HWND window = Mocks::WindowCreate(hInst, L"", L"", 0, WS_BORDER | WS_CAPTION | WS_CLIPSIBLINGS | WS_DLGFRAME | WS_OVERLAPPED | WS_POPUP | WS_POPUPWINDOW | WS_SIZEBOX | WS_SYSMENU | WS_THICKFRAME);
Assert::AreEqual(FancyZonesWindowProcessing::ProcessabilityType::Processable, FancyZonesWindowProcessing::DefineWindowType(window));
Assert::IsTrue(FancyZonesWindowProcessing::IsProcessable(window));
Assert::IsTrue(FancyZonesWindowProcessing::IsProcessableAutomatically(window));
Assert::IsTrue(FancyZonesWindowProcessing::IsProcessableManually(window));
}
TEST_METHOD(Popup_FacebookMessenger)
@ -123,7 +134,8 @@ namespace FancyZonesUnitTests
HWND window = Mocks::WindowCreate(hInst, L"", L"", 0, WS_GROUP | WS_MAXIMIZEBOX | WS_MINIMIZEBOX | WS_POPUP | WS_TABSTOP | WS_THICKFRAME);
Assert::AreEqual(FancyZonesWindowProcessing::ProcessabilityType::Processable, FancyZonesWindowProcessing::DefineWindowType(window));
Assert::IsTrue(FancyZonesWindowProcessing::IsProcessable(window));
Assert::IsTrue(FancyZonesWindowProcessing::IsProcessableAutomatically(window));
Assert::IsTrue(FancyZonesWindowProcessing::IsProcessableManually(window));
}
TEST_METHOD (ChildWindow_OptionDisabled)
@ -142,7 +154,8 @@ namespace FancyZonesUnitTests
Assert::IsTrue(FancyZonesWindowUtils::HasVisibleOwner(window), L"Child window doesn't have visible owner");
Assert::AreEqual(FancyZonesWindowProcessing::ProcessabilityType::ChildWindow, FancyZonesWindowProcessing::DefineWindowType(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessable(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessableAutomatically(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessableManually(window));
}
TEST_METHOD (ChildWindow_OptionEnabled)
@ -159,7 +172,8 @@ namespace FancyZonesUnitTests
HWND window = Mocks::WindowCreate(hInst, L"", L"", 0, 0, parentWindow);
Assert::AreEqual(FancyZonesWindowProcessing::ProcessabilityType::Processable, FancyZonesWindowProcessing::DefineWindowType(window));
Assert::IsTrue(FancyZonesWindowProcessing::IsProcessable(window));
Assert::IsTrue(FancyZonesWindowProcessing::IsProcessableAutomatically(window));
Assert::IsTrue(FancyZonesWindowProcessing::IsProcessableManually(window));
}
TEST_METHOD (ExcludedApp_ByDefault)
@ -168,7 +182,8 @@ namespace FancyZonesUnitTests
HWND window = Mocks::WindowCreate(hInst, L"", L"SysListView32");
Assert::AreEqual(FancyZonesWindowProcessing::ProcessabilityType::Excluded, FancyZonesWindowProcessing::DefineWindowType(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessable(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessableAutomatically(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessableManually(window));
}
TEST_METHOD (ExcludedApp_ByDefault_SplashScreen)
@ -176,7 +191,8 @@ namespace FancyZonesUnitTests
HWND window = Mocks::WindowCreate(hInst, L"", L"MsoSplash");
Assert::AreEqual(FancyZonesWindowProcessing::ProcessabilityType::Excluded, FancyZonesWindowProcessing::DefineWindowType(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessable(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessableAutomatically(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessableManually(window));
}
TEST_METHOD (ExcludedApp_ByUser)
@ -188,7 +204,18 @@ namespace FancyZonesUnitTests
HWND window = Mocks::WindowCreate(hInst, L"Test_Excluded");
Assert::AreEqual(FancyZonesWindowProcessing::ProcessabilityType::Excluded, FancyZonesWindowProcessing::DefineWindowType(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessable(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessableAutomatically(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessableManually(window));
}
TEST_METHOD (LaunchedByWorkspaces)
{
HWND window = Mocks::WindowCreate(hInst, L"", L"", 0, WS_TILEDWINDOW);
WorkspacesWindowProperties::StampWorkspacesLaunchedProperty(window);
Assert::AreEqual(FancyZonesWindowProcessing::ProcessabilityType::Processable, FancyZonesWindowProcessing::DefineWindowType(window));
Assert::IsFalse(FancyZonesWindowProcessing::IsProcessableAutomatically(window));
Assert::IsTrue(FancyZonesWindowProcessing::IsProcessableManually(window));
}
TEST_METHOD (ProcessableWindow)
@ -196,7 +223,8 @@ namespace FancyZonesUnitTests
HWND window = Mocks::WindowCreate(hInst, L"", L"", 0, WS_TILEDWINDOW);
Assert::AreEqual(FancyZonesWindowProcessing::ProcessabilityType::Processable, FancyZonesWindowProcessing::DefineWindowType(window));
Assert::IsTrue(FancyZonesWindowProcessing::IsProcessable(window));
Assert::IsTrue(FancyZonesWindowProcessing::IsProcessableAutomatically(window));
Assert::IsTrue(FancyZonesWindowProcessing::IsProcessableManually(window));
}
};
}