[KBM] Open Remap Shortcuts/Remap Keyboard window on the same monitor as Settings. (#8325)

src/common/common.vcxproj

@@ -128,6 +128,7 @@
     <ClInclude Include="keyboard_layout.h" />
     <ClInclude Include="keyboard_layout_impl.h" />
     <ClInclude Include="LowlevelKeyboardEvent.h" />
+    <ClInclude Include="monitor_utils.h" />
     <ClInclude Include="notifications.h" />
     <ClInclude Include="processApi.h" />
     <ClInclude Include="RcResource.h" />

src/common/common.vcxproj.filters

@@ -132,6 +132,9 @@
     <ClInclude Include="toast_dont_show_again.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="monitor_utils.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp" />

src/common/monitor_utils.h

@@ -0,0 +1,47 @@
+#pragma once
+
+#include "gdiplus.h"
+
+template<RECT MONITORINFO::*member>
+std::vector<std::pair<HMONITOR, RECT>> GetAllMonitorRects()
+{
+    using result_t = std::vector<std::pair<HMONITOR, RECT>>;
+    result_t result;
+
+    auto enumMonitors = [](HMONITOR monitor, HDC hdc, LPRECT pRect, LPARAM param) -> BOOL {
+        MONITORINFOEX mi;
+        mi.cbSize = sizeof(mi);
+        result_t& result = *reinterpret_cast<result_t*>(param);
+        if (GetMonitorInfo(monitor, &mi))
+        {
+            result.push_back({ monitor, mi.*member });
+        }
+
+        return TRUE;
+    };
+
+    EnumDisplayMonitors(NULL, NULL, enumMonitors, reinterpret_cast<LPARAM>(&result));
+    return result;
+}
+
+template<RECT MONITORINFO::*member>
+std::vector<std::pair<HMONITOR, MONITORINFOEX>> GetAllMonitorInfo()
+{
+    using result_t = std::vector<std::pair<HMONITOR, MONITORINFOEX>>;
+    result_t result;
+
+    auto enumMonitors = [](HMONITOR monitor, HDC hdc, LPRECT pRect, LPARAM param) -> BOOL {
+        MONITORINFOEX mi;
+        mi.cbSize = sizeof(mi);
+        result_t& result = *reinterpret_cast<result_t*>(param);
+        if (GetMonitorInfo(monitor, &mi))
+        {
+            result.push_back({ monitor, mi });
+        }
+
+        return TRUE;
+    };
+
+    EnumDisplayMonitors(NULL, NULL, enumMonitors, reinterpret_cast<LPARAM>(&result));
+    return result;
+}

src/modules/fancyzones/lib/FancyZones.cpp

@@ -2,6 +2,7 @@
 
 #include <common/common.h>
 #include <common/dpi_aware.h>
+#include <common/monitor_utils.h>
 #include <common/on_thread_executor.h>
 #include <common/window_helpers.h>
 
@@ -636,7 +637,7 @@ void FancyZones::ToggleEditor() noexcept
     params += std::to_wstring(spanZonesAcrossMonitors) + divider; /* Span zones */
 
     std::vector<std::pair<HMONITOR, MONITORINFOEX>> allMonitors;
-    allMonitors = FancyZonesUtils::GetAllMonitorInfo<&MONITORINFOEX::rcWork>();
+    allMonitors = GetAllMonitorInfo<&MONITORINFOEX::rcWork>();
     
     // device id map 
     std::unordered_map<std::wstring, DWORD> displayDeviceIdxMap;
@@ -1116,7 +1117,7 @@ bool FancyZones::OnSnapHotkeyBasedOnPosition(HWND window, DWORD vkCode) noexcept
         current = MonitorFromWindow(window, MONITOR_DEFAULTTONULL);
     }
 
-    auto allMonitors = FancyZonesUtils::GetAllMonitorRects<&MONITORINFOEX::rcWork>();
+    auto allMonitors = GetAllMonitorRects<&MONITORINFOEX::rcWork>();
 
     if (current && allMonitors.size() > 1 && m_settings->GetSettings()->moveWindowAcrossMonitors)
     {

src/modules/fancyzones/lib/util.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "gdiplus.h"
+#include <common/monitor_utils.h>
 #include <common/string_utils.h>
 
 namespace FancyZonesDataTypes
@@ -114,50 +115,6 @@ namespace FancyZonesUtils
         return static_cast<BYTE>(opacity * 2.55);
     }
 
-    template<RECT MONITORINFO::*member>
-    std::vector<std::pair<HMONITOR, RECT>> GetAllMonitorRects()
-    {
-        using result_t = std::vector<std::pair<HMONITOR, RECT>>;
-        result_t result;
-
-        auto enumMonitors = [](HMONITOR monitor, HDC hdc, LPRECT pRect, LPARAM param) -> BOOL {
-            MONITORINFOEX mi;
-            mi.cbSize = sizeof(mi);
-            result_t& result = *reinterpret_cast<result_t*>(param);
-            if (GetMonitorInfo(monitor, &mi))
-            {
-                result.push_back({ monitor, mi.*member });
-            }
-
-            return TRUE;
-        };
-
-        EnumDisplayMonitors(NULL, NULL, enumMonitors, reinterpret_cast<LPARAM>(&result));
-        return result;
-    }
-
-    template<RECT MONITORINFO::*member>
-    std::vector<std::pair<HMONITOR, MONITORINFOEX>> GetAllMonitorInfo()
-    {
-        using result_t = std::vector<std::pair<HMONITOR, MONITORINFOEX>>;
-        result_t result;
-
-        auto enumMonitors = [](HMONITOR monitor, HDC hdc, LPRECT pRect, LPARAM param) -> BOOL {
-            MONITORINFOEX mi;
-            mi.cbSize = sizeof(mi);
-            result_t& result = *reinterpret_cast<result_t*>(param);
-            if (GetMonitorInfo(monitor, &mi))
-            {
-                result.push_back({ monitor, mi });
-            }
-
-            return TRUE;
-        };
-
-        EnumDisplayMonitors(NULL, NULL, enumMonitors, reinterpret_cast<LPARAM>(&result));
-        return result;
-    }
-
     template<RECT MONITORINFO::*member>
     RECT GetAllMonitorsCombinedRect()
     {

src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp

@@ -118,21 +118,21 @@ void createEditKeyboardWindow(HINSTANCE hInst, KeyboardManagerState& keyboardMan
         isEditKeyboardWindowRegistrationCompleted = true;
     }
 
-    // Find center screen coordinates
-    RECT desktopRect;
-    GetClientRect(GetDesktopWindow(), &desktopRect);
+    // Find coordinates of the screen where the settings window is placed.
+    RECT desktopRect = UIHelpers::GetForegroundWindowDesktopRect();
+
     // Calculate DPI dependent window size
     int windowWidth = KeyboardManagerConstants::DefaultEditKeyboardWindowWidth;
     int windowHeight = KeyboardManagerConstants::DefaultEditKeyboardWindowHeight;
     DPIAware::Convert(nullptr, windowWidth, windowHeight);
-
+    
     // Window Creation
     HWND _hWndEditKeyboardWindow = CreateWindow(
         szWindowClass,
         GET_RESOURCE_STRING(IDS_EDITKEYBOARD_WINDOWNAME).c_str(),
         WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MAXIMIZEBOX,
-        (desktopRect.right / 2) - (windowWidth / 2),
-        (desktopRect.bottom / 2) - (windowHeight / 2),
+        ((desktopRect.right + desktopRect.left) / 2) - (windowWidth / 2),
+        ((desktopRect.bottom + desktopRect.top) / 2) - (windowHeight / 2),
         windowWidth,
         windowHeight,
         NULL,

src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp

@@ -77,9 +77,9 @@ void createEditShortcutsWindow(HINSTANCE hInst, KeyboardManagerState& keyboardMa
         isEditShortcutsWindowRegistrationCompleted = true;
     }
 
-    // Find center screen coordinates
-    RECT desktopRect;
-    GetClientRect(GetDesktopWindow(), &desktopRect);
+    // Find coordinates of the screen where the settings window is placed.
+    RECT desktopRect = UIHelpers::GetForegroundWindowDesktopRect();
+
     // Calculate DPI dependent window size
     int windowWidth = KeyboardManagerConstants::DefaultEditShortcutsWindowWidth;
     int windowHeight = KeyboardManagerConstants::DefaultEditShortcutsWindowHeight;
@@ -90,8 +90,8 @@ void createEditShortcutsWindow(HINSTANCE hInst, KeyboardManagerState& keyboardMa
         szWindowClass,
         GET_RESOURCE_STRING(IDS_EDITSHORTCUTS_WINDOWNAME).c_str(),
         WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MAXIMIZEBOX,
-        (desktopRect.right / 2) - (windowWidth / 2),
-        (desktopRect.bottom / 2) - (windowHeight / 2),
+        ((desktopRect.right + desktopRect.left) / 2) - (windowWidth / 2),
+        ((desktopRect.bottom + desktopRect.top) / 2) - (windowHeight / 2),
         windowWidth,
         windowHeight,
         NULL,

src/modules/keyboardmanager/ui/UIHelpers.cpp

@@ -1,6 +1,8 @@
 #include "pch.h"
 #include "UIHelpers.h"
 
+#include <common/monitor_utils.h>
+
 namespace UIHelpers
 {
     // This method sets focus to the first Type button on the last row of the Grid
@@ -15,4 +17,22 @@ namespace UIHelpers
         // Set programmatic focus on the button
         firstTypeButtonInLastRow.Focus(FocusState::Programmatic);
     }
+
+    RECT GetForegroundWindowDesktopRect()
+    {
+        HWND window = GetForegroundWindow();
+        HMONITOR settingsMonitor = MonitorFromWindow(window, MONITOR_DEFAULTTONULL);
+        RECT desktopRect{};
+        auto monitors = GetAllMonitorRects<&MONITORINFOEX::rcWork>();
+        for (const auto& monitor : monitors)
+        {
+            if (settingsMonitor == monitor.first)
+            {
+                desktopRect = monitor.second;
+                break;
+            }
+        }
+
+        return desktopRect;
+    }
 }

src/modules/keyboardmanager/ui/UIHelpers.h

@@ -5,4 +5,6 @@ namespace UIHelpers
 {
     // This method sets focus to the first Type button on the last row of the Grid
     void SetFocusOnTypeButtonInLastRow(StackPanel& parent, long colCount);
+
+    RECT GetForegroundWindowDesktopRect();
 }