UI: Use rect intersection test for validating position

Instead of checking to see if the window's position is valid, check to
see if the rectangles of the window and the monitor intersect via a
rectangle intersection test.
This commit is contained in:
jp9000
2016-09-28 22:26:28 -07:00
parent a8020b37be
commit 48f0c73f82
3 changed files with 9 additions and 9 deletions
+7 -5
View File
@@ -1518,17 +1518,19 @@ bool GetClosestUnusedFileName(std::string &path, const char *extension)
return true;
}
bool WindowPositionValid(int x, int y)
bool WindowPositionValid(QRect rect)
{
vector<MonitorInfo> monitors;
GetMonitors(monitors);
for (auto &monitor : monitors) {
int br_x = monitor.x + monitor.cx;
int br_y = monitor.y + monitor.cy;
int left = int(monitor.x);
int top = int(monitor.y);
int right = left + int(monitor.cx);
int bottom = top + int(monitor.cy);
if (x >= monitor.x && x < br_x &&
y >= monitor.y && y < br_y)
if ((rect.left() - right) < 0 && (left - rect.right()) < 0 &&
(rect.top() - bottom) < 0 && (top - rect.bottom()) < 0)
return true;
}