jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1471 from admshao/always-on-top-projectors 

UI: Fix not all projectors using ProjectorAlwaysOnTop
master
Jim 2018-09-05 15:17:24 -07:00 committed by GitHub
parent c5e1541cbe f8dfa4cb70
commit d5a144e7aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
UI/window-projector.cpp
View File

@ -36,9 +36,6 @@ OBSProjector::OBSProjector(QWidget *widget, obs_source_t *source_, int monitor,
windowedProjectors.push_back(this); windowedProjectors.push_back(this);
resize(480, 270); resize(480, 270);
SetAlwaysOnTop(this, config_get_bool(GetGlobalConfig(),
"BasicWindow", "ProjectorAlwaysOnTop"));
} else { } else {
setWindowFlags(Qt::FramelessWindowHint | setWindowFlags(Qt::FramelessWindowHint |
Qt::X11BypassWindowManagerHint); Qt::X11BypassWindowManagerHint);
@ -51,10 +48,11 @@ OBSProjector::OBSProjector(QWidget *widget, obs_source_t *source_, int monitor,
addAction(action); addAction(action);
connect(action, SIGNAL(triggered()), this, connect(action, SIGNAL(triggered()), this,
SLOT(EscapeTriggered())); SLOT(EscapeTriggered()));
SetAlwaysOnTop(this, true);
} }
SetAlwaysOnTop(this, config_get_bool(GetGlobalConfig(),
"BasicWindow", "ProjectorAlwaysOnTop"));
setAttribute(Qt::WA_DeleteOnClose, true); setAttribute(Qt::WA_DeleteOnClose, true);
//disable application quit when last window closed //disable application quit when last window closed