Skip to content

Commit 53133f0

Browse files
[HotFix]Revert "[FancyZones]Filtering popup windows for all operations (#28975)" (#29532)
This reverts commit 1b333df.
1 parent cded4ef commit 53133f0

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

src/modules/fancyzones/FancyZonesLib/FancyZones.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,15 @@ void FancyZones::WindowCreated(HWND window) noexcept
394394
return;
395395
}
396396

397+
// Hotfix
398+
// Avoid automatically moving popup windows, as they can be just popup menus.
399+
bool isPopup = FancyZonesWindowUtils::IsPopupWindow(window);
400+
bool hasThickFrame = FancyZonesWindowUtils::HasThickFrame(window);
401+
if (isPopup && !hasThickFrame)
402+
{
403+
return;
404+
}
405+
397406
// Avoid already stamped (zoned) windows
398407
const bool isZoned = !FancyZonesWindowProperties::RetrieveZoneIndexProperty(window).empty();
399408
if (isZoned)

src/modules/fancyzones/FancyZonesLib/FancyZonesWindowProcessing.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ bool FancyZonesWindowProcessing::IsProcessable(HWND window) noexcept
2727

2828
// popup could be the window we don't want to snap: start menu, notification popup, tray window, etc.
2929
// also, popup could be the windows we want to snap disregarding the "allowSnapPopupWindows" setting, e.g. Telegram
30-
bool isPopup = FancyZonesWindowUtils::IsPopupWindow(window);
31-
bool hasThickFrame = FancyZonesWindowUtils::HasThickFrame(window);
32-
if (isPopup && (!hasThickFrame || !FancyZonesSettings::settings().allowSnapPopupWindows))
30+
bool isPopup = FancyZonesWindowUtils::IsPopupWindow(window) && !FancyZonesWindowUtils::HasThickFrameAndMinimizeMaximizeButtons(window);
31+
if (isPopup && !FancyZonesSettings::settings().allowSnapPopupWindows)
3332
{
3433
return false;
3534
}

0 commit comments

Comments
 (0)