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: Check to ensure window starts up inside a monitor

Browse source 
Fixes an issue where the main window would load off-screen if its last
saved position was inside a monitor that no longer exists.
This commit is contained in:
jp9000 2016-05-05 15:31:35 -07:00
parent 0157d02564
commit 8932bd39d1
3 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
obs/obs-app.cpp
View file

@ -1483,6 +1483,23 @@ bool GetClosestUnusedFileName(std::string &path, const char *extension)
return true;
}
bool WindowPositionValid(int x, int y)
{
vector<MonitorInfo> monitors;
GetMonitors(monitors);
for (auto &monitor : monitors) {
int br_x = monitor.x + monitor.cx;
int br_y = monitor.y + monitor.cy;
if (x >= monitor.x && x < br_x &&
y >= monitor.y && y < br_y)
return true;
}
return false;
}
static inline bool arg_is(const char *arg,
const char *long_form, const char *short_form)
{

2
obs/obs-app.hpp
View file

@ -147,6 +147,8 @@ 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);
static inline int GetProfilePath(char *path, size_t size, const char *file)
{
OBSMainWindow *window = reinterpret_cast<OBSMainWindow*>(

3
obs/window-basic-main.cpp
View file

@ -132,6 +132,9 @@ OBSBasic::OBSBasic(QWidget *parent)
int posy = config_get_int(App()->GlobalConfig(), "BasicWindow",
"posy");
if (!WindowPositionValid(posx, posy))
posx = posy = 0;
setGeometry(posx, posy, width, height);
}