From 39cac396f58276404fdc9813a622c2a54a456fb3 Mon Sep 17 00:00:00 2001
From: vldmr11080 <57061786+vldmr11080@users.noreply.github.com>
Date: Thu, 5 Mar 2020 08:01:58 +0100
Subject: [PATCH] Swallow shift keyboard event when dragging window (#1423)

---
 src/modules/fancyzones/lib/FancyZones.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/modules/fancyzones/lib/FancyZones.cpp b/src/modules/fancyzones/lib/FancyZones.cpp
index 7c2dc5c56b..9059e4e031 100644
--- a/src/modules/fancyzones/lib/FancyZones.cpp
+++ b/src/modules/fancyzones/lib/FancyZones.cpp
@@ -374,6 +374,10 @@ FancyZones::OnKeyDown(PKBDLLHOOKSTRUCT info) noexcept
         CycleActiveZoneSet(info->vkCode);
         return false;
     }
+    if (m_dragEnabled && shift)
+    {
+        return true;
+    }
     return false;
 }
 
@@ -654,6 +658,7 @@ void FancyZones::AddZoneWindow(HMONITOR monitor, PCWSTR deviceId) noexcept
         {
             m_zoneWindowMap[monitor] = std::move(zoneWindow);
         }
+
         if (newWorkArea)
         {
             RegisterNewWorkArea(m_currentVirtualDesktopId, monitor);