Merge pull request #3066 from cg2121/fix-always-on-top

UI: Fix projector always on top not working on Linux
This commit is contained in:
Jim 2020-06-21 05:50:08 -07:00 committed by GitHub
commit dd12488700
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -24,6 +24,9 @@ OBSProjector::OBSProjector(QWidget *widget, obs_source_t *source_, int monitor,
{
type = type_;
SetAlwaysOnTop(this, config_get_bool(GetGlobalConfig(), "BasicWindow",
"ProjectorAlwaysOnTop"));
setWindowIcon(QIcon::fromTheme("obs", QIcon(":/res/images/obs.png")));
if (monitor == -1)
@ -38,9 +41,6 @@ OBSProjector::OBSProjector(QWidget *widget, obs_source_t *source_, int monitor,
addAction(action);
connect(action, SIGNAL(triggered()), this, SLOT(EscapeTriggered()));
SetAlwaysOnTop(this, config_get_bool(GetGlobalConfig(), "BasicWindow",
"ProjectorAlwaysOnTop"));
setAttribute(Qt::WA_DeleteOnClose, true);
//disable application quit when last window closed