reapack

commit fa1b70ec5eba3db90abc34f7f0692438fdd4b247
parent c9730b4afaa95d6fdf7258a697e5608fac5d3456
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Thu,  6 Jan 2022 04:18:00 -0500

dialog: improve window positionning on Linux in multimonitor setups

Diffstat:
M
src/dialog.cpp
 | 
33
++++++---------------------------
M
src/main.cpp
 | 
1
+

2 files changed, 7 insertions(+), 27 deletions(-)
diff --git a/src/dialog.cpp b/src/dialog.cpp
@@ -199,11 +199,13 @@ void Dialog::center()
   SWELL_GetViewPort(&screenRect, &dialogRect, false);
 #endif
 
+#ifndef __linux__ // SWELL_GetViewPort only gives the default monitor
   // limit the centering to the monitor containing most of the parent window
   parentRect.left = max(parentRect.left, screenRect.left);
   parentRect.top = max(parentRect.top, screenRect.top);
   parentRect.right = min(parentRect.right, screenRect.right);
   parentRect.bottom = min(parentRect.bottom, screenRect.bottom);
+#endif
 
   const int parentWidth = parentRect.right - parentRect.left;
   const int dialogWidth = dialogRect.right - dialogRect.left;
@@ -217,10 +219,10 @@ void Dialog::center()
 
   const double verticalBias = (top - parentRect.top) * 0.3;
 
-#ifdef _WIN32
-  top -= static_cast<int>(verticalBias);
+#ifdef __APPLE__
+  top += verticalBias; // y starts from the bottom on macOS
 #else
-  top += verticalBias; // according to SWELL, top means bottom.
+  top -= static_cast<int>(verticalBias);
 #endif
 
   boundedMove(left, top);
@@ -228,32 +230,9 @@ void Dialog::center()
 
 void Dialog::boundedMove(int x, int y)
 {
-  using std::min, std::max, std::abs;
-
   RECT rect;
   GetWindowRect(m_handle, &rect);
-
-  const int width = rect.right - rect.left, height = rect.bottom - rect.top;
-
-#ifdef SM_XVIRTUALSCREEN
-  // virtual screen = all screens combined
-  const int viewportX = GetSystemMetrics(SM_XVIRTUALSCREEN);
-  const int viewportWidth = GetSystemMetrics(SM_CXVIRTUALSCREEN);
-  const int viewportY = GetSystemMetrics(SM_YVIRTUALSCREEN);
-  const int viewportHeight = GetSystemMetrics(SM_CYVIRTUALSCREEN);
-#else
-  // SWELL_GetViewPort only gives the rect of the current screen
-  RECT viewport;
-  SWELL_GetViewPort(&viewport, &rect, false);
-
-  const int viewportX = viewport.left;
-  const int viewportWidth = viewport.right - viewportX;
-  const int viewportY = viewport.top;
-  const int viewportHeight = viewport.bottom - viewportY;
-#endif
-
-  x = min(max(viewportX, x), viewportWidth - width - abs(viewportX));
-  y = min(max(viewportY, y), viewportHeight - height - abs(viewportY));
+  EnsureNotCompletelyOffscreen(&rect);
 
   SetWindowPos(m_handle, nullptr, x, y,
     0, 0, SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE);
diff --git a/src/main.cpp b/src/main.cpp
@@ -38,6 +38,7 @@ static bool loadAPI(void *(*getFunc)(const char *))
     REQUIRED_API(Splash_GetWnd),             // v4.7
 
     REQUIRED_API(AddExtensionsMainMenu),
+    REQUIRED_API(EnsureNotCompletelyOffscreen),
     REQUIRED_API(GetAppVersion),
     REQUIRED_API(GetResourcePath),
     REQUIRED_API(NamedCommandLookup),        // v3.1415