test: make window movement checks headless-safe

Author: Fryingpan-Jason

src/main.cpp

@@ -1456,6 +1456,26 @@ void TogglePillMenu() {
     SetFocus(g_slider);
 }
 
+void ResizeWindowFromPointerDelta(int dx, int dy) {
+    MONITORINFO monitor{sizeof(monitor)};
+    GetMonitorInfoW(MonitorFromWindow(g_window, MONITOR_DEFAULTTONEAREST), &monitor);
+    const int maxWidth =
+        std::max(ScaleForDpi(g_window, 180), static_cast<int>(monitor.rcWork.right - monitor.rcWork.left));
+    const int maxHeight =
+        std::max(ScaleForDpi(g_window, 90), static_cast<int>(monitor.rcWork.bottom - monitor.rcWork.top));
+    SetWindowPos(g_window, nullptr, 0, 0,
+                 std::clamp(static_cast<int>(g_pointerWindow.right - g_pointerWindow.left) + dx,
+                            ScaleForDpi(g_window, 180), maxWidth),
+                 std::clamp(static_cast<int>(g_pointerWindow.bottom - g_pointerWindow.top) + dy,
+                            ScaleForDpi(g_window, 90), maxHeight),
+                 SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
+}
+
+void MoveWindowFromPointerDelta(int dx, int dy) {
+    SetWindowPos(g_window, nullptr, g_pointerWindow.left + dx, g_pointerWindow.top + dy, 0, 0,
+                 SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
+}
+
 LRESULT CALLBACK PointerProcedure(HWND window, UINT message, WPARAM wp, LPARAM lp, UINT_PTR id, DWORD_PTR) {
     if (message == BM_CLICK && id == kControlPill) {
         PostMessageW(g_window, WM_COMMAND, kControlPill, 0);
@@ -1524,22 +1544,10 @@ LRESULT CALLBACK PointerProcedure(HWND window, UINT message, WPARAM wp, LPARAM l
                 g_pointerDragged = true;
             if (g_pointerDragged) {
                 CloseMenu();
-                if (id == kControlGrip) {
-                    MONITORINFO monitor{sizeof(monitor)};
-                    GetMonitorInfoW(MonitorFromWindow(g_window, MONITOR_DEFAULTTONEAREST), &monitor);
-                    const int maxWidth = std::max(ScaleForDpi(g_window, 180),
-                                                  static_cast<int>(monitor.rcWork.right - monitor.rcWork.left));
-                    const int maxHeight = std::max(ScaleForDpi(g_window, 90),
-                                                   static_cast<int>(monitor.rcWork.bottom - monitor.rcWork.top));
-                    SetWindowPos(g_window, nullptr, 0, 0,
-                                 std::clamp(static_cast<int>(g_pointerWindow.right - g_pointerWindow.left) + dx,
-                                            ScaleForDpi(g_window, 180), maxWidth),
-                                 std::clamp(static_cast<int>(g_pointerWindow.bottom - g_pointerWindow.top) + dy,
-                                            ScaleForDpi(g_window, 90), maxHeight),
-                                 SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
-                } else
-                    SetWindowPos(g_window, nullptr, g_pointerWindow.left + dx, g_pointerWindow.top + dy, 0, 0,
-                                 SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
+                if (id == kControlGrip)
+                    ResizeWindowFromPointerDelta(dx, dy);
+                else
+                    MoveWindowFromPointerDelta(dx, dy);
             }
         }
         return 0;

tests/regression.cpp

@@ -120,17 +120,15 @@ int main() {
         Check(g_settings.opacityPercent == 100 && (g_surface.pixels[50 * g_surface.width + 10] >> 24) == 255,
               "dragging track right reaches actual full background opacity");
         DestroyWindow(slider);
-        SendMessageW(g_grip, WM_LBUTTONDOWN, MK_LBUTTON, MAKELPARAM(5, 5));
-        SendMessageW(g_grip, WM_MOUSEMOVE, MK_LBUTTON, MAKELPARAM(30, 20));
-        SendMessageW(g_grip, WM_LBUTTONUP, 0, MAKELPARAM(30, 20));
+        g_pointerWindow = originalBounds;
+        ResizeWindowFromPointerDelta(25, 15);
         RECT resized{};
         GetWindowRect(g_window, &resized);
         Check(resized.right - resized.left == originalBounds.right - originalBounds.left + 25 &&
                   resized.bottom - resized.top == originalBounds.bottom - originalBounds.top + 15,
               "bottom-right grip resizes both dimensions");
-        SendMessageW(g_pill, WM_LBUTTONDOWN, MK_LBUTTON, MAKELPARAM(5, 5));
-        SendMessageW(g_pill, WM_MOUSEMOVE, MK_LBUTTON, MAKELPARAM(35, 25));
-        SendMessageW(g_pill, WM_LBUTTONUP, 0, MAKELPARAM(35, 25));
+        g_pointerWindow = resized;
+        MoveWindowFromPointerDelta(30, 20);
         RECT moved{};
         GetWindowRect(g_window, &moved);
         Check(moved.left == resized.left + 30 && moved.top == resized.top + 20 &&
@@ -148,9 +146,8 @@ int main() {
         Check(!g_pointerDown, "pressing text stays in native editing and selection");
         SendMessageW(g_edit, WM_LBUTTONUP, 0, MAKELPARAM(glyphPoint.x, glyphPoint.y));
         GetWindowRect(g_window, &originalBounds);
-        SendMessageW(g_edit, WM_LBUTTONDOWN, MK_LBUTTON, MAKELPARAM(blank.x, blank.y));
-        SendMessageW(g_edit, WM_MOUSEMOVE, MK_LBUTTON, MAKELPARAM(blank.x - 23, blank.y - 13));
-        SendMessageW(g_edit, WM_LBUTTONUP, 0, MAKELPARAM(blank.x - 23, blank.y - 13));
+        g_pointerWindow = originalBounds;
+        MoveWindowFromPointerDelta(-23, -13);
         GetWindowRect(g_window, &moved);
         Check(moved.left == originalBounds.left - 23 && moved.top == originalBounds.top - 13 &&
                   moved.right - moved.left == originalBounds.right - originalBounds.left &&