Fix "Always on top" setting for MacOS and Linux (#1708)

Closes #1166
2020-05-30 05:32:25 -04:00
parent 6d5ba0c442
commit ccdbedb93c
1 changed files with 8 additions and 3 deletions
@@ -214,9 +214,14 @@ void BaseWindow::init()
        });
    }
 #else
-//    if (getSettings()->windowTopMost.getValue()) {
+    // TopMost flag overrides setting
-//        this->setWindowFlag(Qt::WindowStaysOnTopHint);
+    if (!this->flags_.has(TopMost))
-//    }
+    {
        getSettings()->windowTopMost.connect([this](bool topMost, auto) {
            this->setWindowFlag(Qt::WindowStaysOnTopHint, topMost);
            this->show();
        });
    }
 #endif
 }