Merge pull request #3324 from cg2121/projector-bug

UI: Fix projector not working on secondary monitors
This commit is contained in:
Jim
2020-08-24 00:52:21 -07:00
committed by GitHub
+6 -7
View File
@@ -24,10 +24,13 @@ OBSProjector::OBSProjector(QWidget *widget, obs_source_t *source_, int monitor,
removedSignal(obs_source_get_signal_handler(source), "remove",
OBSSourceRemoved, this)
{
type = type_;
isAlwaysOnTop = config_get_bool(GetGlobalConfig(), "BasicWindow",
"ProjectorAlwaysOnTop");
SetAlwaysOnTop(this, config_get_bool(GetGlobalConfig(), "BasicWindow",
"ProjectorAlwaysOnTop"));
if (isAlwaysOnTop)
setWindowFlags(Qt::WindowStaysOnTopHint);
type = type_;
setWindowIcon(QIcon::fromTheme("obs", QIcon(":/res/images/obs.png")));
@@ -43,10 +46,6 @@ OBSProjector::OBSProjector(QWidget *widget, obs_source_t *source_, int monitor,
addAction(action);
connect(action, SIGNAL(triggered()), this, SLOT(EscapeTriggered()));
isAlwaysOnTop = config_get_bool(GetGlobalConfig(), "BasicWindow",
"ProjectorAlwaysOnTop");
SetAlwaysOnTop(this, isAlwaysOnTop);
setAttribute(Qt::WA_DeleteOnClose, true);
//disable application quit when last window closed