Modifying the startup behaviour of the FancyZones Layout Editor

Add setting to allow to choose if the FZ editor opens in the screen where mouse cursor is or where the active windows is.

src/common/dpi_aware.cpp

@@ -14,6 +14,18 @@ HRESULT DPIAware::GetScreenDPIForWindow(HWND hwnd, UINT &dpi_x, UINT &dpi_y) {
   }
 }
 
+HRESULT DPIAware::GetScreenDPIForPoint(POINT p, UINT& dpi_x, UINT& dpi_y) {
+  auto monitor_handle = MonitorFromPoint(p, MONITOR_DEFAULTTONEAREST);
+  dpi_x = 0;
+  dpi_y = 0;
+  if (monitor_handle != nullptr) {
+    return GetDpiForMonitor(monitor_handle, MDT_EFFECTIVE_DPI, &dpi_x, &dpi_y);
+  }
+  else {
+    return E_FAIL;
+  }
+}
+
 void DPIAware::Convert(HMONITOR monitor_handle, int &width, int &height) {
   if (monitor_handle == NULL) {
     const POINT ptZero = { 0, 0 };

src/common/dpi_aware.h

@@ -7,5 +7,6 @@ private:
 
 public:
   static HRESULT GetScreenDPIForWindow(HWND hwnd, UINT & dpi_x, UINT & dpi_y);
+  static HRESULT GetScreenDPIForPoint(POINT p, UINT& dpi_x, UINT& dpi_y);
   static void Convert(HMONITOR monitor_handle, int &width, int &height);
 };

src/modules/fancyzones/lib/FancyZones.cpp

@@ -237,16 +237,37 @@ void FancyZones::ToggleEditor() noexcept
         m_terminateEditorEvent.reset(CreateEvent(nullptr, true, false, nullptr));
     }
 
-    const HWND foregroundWindow = GetForegroundWindow();
-    if (const HMONITOR monitor = MonitorFromWindow(foregroundWindow, MONITOR_DEFAULTTOPRIMARY))
-    {
-        std::shared_lock readLock(m_lock);
-        auto iter = m_zoneWindowMap.find(monitor);
-        if (iter != m_zoneWindowMap.end())
-        {
+    HMONITOR monitor{};
     UINT dpi_x = 96;
     UINT dpi_y = 96;
+
+    if (m_settings->GetSettings().use_cursorpos_editor_startupscreen)
+    {
+        POINT currentCursorPos{};
+        GetCursorPos(&currentCursorPos);
+
+        monitor = MonitorFromPoint(currentCursorPos, MONITOR_DEFAULTTOPRIMARY);
+        DPIAware::GetScreenDPIForPoint(currentCursorPos, dpi_x, dpi_y);
+    }
+    else
+    {
+        const HWND foregroundWindow = GetForegroundWindow();
+        monitor = MonitorFromWindow(foregroundWindow, MONITOR_DEFAULTTOPRIMARY);
         DPIAware::GetScreenDPIForWindow(foregroundWindow, dpi_x, dpi_y);
+    }
+
+
+    if (!monitor)
+    {
+        return;
+    }
+
+    std::shared_lock readLock(m_lock);
+    auto iter = m_zoneWindowMap.find(monitor);
+    if (iter == m_zoneWindowMap.end())
+    {
+        return;
+    }
 
     MONITORINFOEX mi;
     mi.cbSize = sizeof(mi);
@@ -303,10 +324,9 @@ void FancyZones::ToggleEditor() noexcept
         }
         CloseHandle(processHandle);
     });
+
     waitForEditorThread.detach();
 }
-    }
-}
 
 // IZoneWindowHost
 IFACEMETHODIMP_(void) FancyZones::ToggleZoneViewers() noexcept

src/modules/fancyzones/lib/Settings.cpp

@@ -32,7 +32,7 @@ private:
         PCWSTR name;
         bool* value;
         int resourceId;
-    } m_configBools[8] = {
+    } m_configBools[9] = {
         { L"fancyzones_shiftDrag", &m_settings.shiftDrag, IDS_SETTING_DESCRIPTION_SHIFTDRAG },
         { L"fancyzones_overrideSnapHotkeys", &m_settings.overrideSnapHotkeys, IDS_SETTING_DESCRIPTION_OVERRIDE_SNAP_HOTKEYS },
         { L"fancyzones_zoneSetChange_flashZones", &m_settings.zoneSetChange_flashZones, IDS_SETTING_DESCRIPTION_ZONESETCHANGE_FLASHZONES },
@@ -41,6 +41,7 @@ private:
         { L"fancyzones_virtualDesktopChange_moveWindows", &m_settings.virtualDesktopChange_moveWindows, IDS_SETTING_DESCRIPTION_VIRTUALDESKTOPCHANGE_MOVEWINDOWS },
         { L"fancyzones_appLastZone_moveWindows", &m_settings.appLastZone_moveWindows, IDS_SETTING_DESCRIPTION_APPLASTZONE_MOVEWINDOWS },
         { L"fancyzones_use_standalone_editor", &m_settings.use_standalone_editor, IDS_SETTING_DESCRIPTION_USE_STANDALONE_EDITOR },
+        { L"use_cursorpos_editor_startupscreen", &m_settings.use_cursorpos_editor_startupscreen, IDS_SETTING_DESCRIPTION_USE_CURSORPOS_EDITOR_STARTUPSCREEN },
     };
 
     struct

src/modules/fancyzones/lib/Settings.h

@@ -13,6 +13,7 @@ struct Settings
     bool overrideSnapHotkeys = false;
     bool appLastZone_moveWindows = false;
     bool use_standalone_editor = true;
+    bool use_cursorpos_editor_startupscreen = true;
     std::wstring zoneHightlightColor = L"#0078D7";
 };
 

src/modules/fancyzones/lib/fancyzones.rc

@@ -13,6 +13,7 @@
     IDS_SETTING_DESCRIPTION_ZONESETCHANGE_FLASHZONES "Flash zones when the active FancyZones layout changes"
     IDS_SETTING_DESCRIPTION_ZONEHIGHLIGHTCOLOR "Zone Highlight Color (Default #0078D7)"
     IDS_SETTING_DESCRIPTION_USE_STANDALONE_EDITOR "Use new zone editing experience (Preview)"
+    IDS_SETTING_DESCRIPTION_USE_CURSORPOS_EDITOR_STARTUPSCREEN "Follow mouse cursor instead of focus when launching editor in a multi screen environment"
     IDS_SETTING_DESCRIPTION_APPLASTZONE_MOVEWINDOWS "Move newly created windows to their last known zone"
     IDS_SETTING_LAUNCH_EDITOR_LABEL "Zone configuration"
     IDS_SETTING_LAUNCH_EDITOR_BUTTON "Edit zones"

src/modules/fancyzones/lib/resource.h

@@ -7,7 +7,8 @@
 #define IDS_SETTING_DESCRIPTION_ZONEHIGHLIGHTCOLOR 107
 #define IDS_SETTING_DESCRIPTION_APPLASTZONE_MOVEWINDOWS 108
 #define IDS_SETTING_DESCRIPTION_USE_STANDALONE_EDITOR 109
-#define IDS_SETTING_DESCRIPTION 110
-#define IDS_SETTING_LAUNCH_EDITOR_LABEL 111
-#define IDS_SETTING_LAUNCH_EDITOR_BUTTON 112
-#define IDS_SETTING_LAUNCH_EDITOR_DESCRIPTION 113
+#define IDS_SETTING_DESCRIPTION_USE_CURSORPOS_EDITOR_STARTUPSCREEN 110
+#define IDS_SETTING_DESCRIPTION 111
+#define IDS_SETTING_LAUNCH_EDITOR_LABEL 112
+#define IDS_SETTING_LAUNCH_EDITOR_BUTTON 113
+#define IDS_SETTING_LAUNCH_EDITOR_DESCRIPTION 114