OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-14 23:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Use rect intersection test for validating position

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

12
UI/obs-app.cpp
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;
}

2
UI/obs-app.hpp
View file

@ -166,7 +166,7 @@ inline const char *Str(const char *lookup) {return App()->GetString(lookup);}
bool GetFileSafeName(const char *name, std::string &file);
bool GetClosestUnusedFileName(std::string &path, const char *extension);
bool WindowPositionValid(int x, int y);
bool WindowPositionValid(QRect rect);
static inline int GetProfilePath(char *path, size_t size, const char *file)
{

4
UI/window-basic-main.cpp
View file

@ -137,9 +137,7 @@ OBSBasic::OBSBasic(QWidget *parent)
restoreGeometry(byteArray);
QRect windowGeometry = normalGeometry();
int posx = windowGeometry.x();
int posy = windowGeometry.y();
if (!WindowPositionValid(posx, posy)) {
if (!WindowPositionValid(windowGeometry)) {
QRect rect = App()->desktop()->availableGeometry();
setGeometry(QStyle::alignedRect(
Qt::LeftToRight,