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

UI: Fix not all projectors using ProjectorAlwaysOnTop
This commit is contained in:
Jim
2018-09-05 15:17:24 -07:00
committed by GitHub
+3 -5
View File
@@ -36,9 +36,6 @@ OBSProjector::OBSProjector(QWidget *widget, obs_source_t *source_, int monitor,
windowedProjectors.push_back(this);
resize(480, 270);
SetAlwaysOnTop(this, config_get_bool(GetGlobalConfig(),
"BasicWindow", "ProjectorAlwaysOnTop"));
} else {
setWindowFlags(Qt::FramelessWindowHint |
Qt::X11BypassWindowManagerHint);
@@ -51,10 +48,11 @@ OBSProjector::OBSProjector(QWidget *widget, obs_source_t *source_, int monitor,
addAction(action);
connect(action, SIGNAL(triggered()), this,
SLOT(EscapeTriggered()));
SetAlwaysOnTop(this, true);
}
SetAlwaysOnTop(this, config_get_bool(GetGlobalConfig(),
"BasicWindow", "ProjectorAlwaysOnTop"));
setAttribute(Qt::WA_DeleteOnClose, true);
//disable application quit when last window closed