fix: wrong window flags

remove Qt::Dialog flag Change-Id: I248c118412cb7f1d837c06ad5fb65a06c38d783e
linuxdeepin · Feb 19, 2019 · a843b5f · a843b5f
1 parent 64f5b13
commit a843b5f
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/dbusscreensaver.cpp b/src/dbusscreensaver.cpp
@@ -174,9 +174,9 @@ bool DBusScreenSaver::Preview(const QString &name, int staysOn, bool preview)
         }
 
         if (staysOn) {
-            window->setFlags(Qt::WindowStaysOnTopHint);
+            window->setFlags(window->flags() | Qt::WindowStaysOnTopHint);
         } else {
-            window->setFlags(Qt::WindowStaysOnBottomHint);
+            window->setFlags(window->flags() | Qt::WindowStaysOnBottomHint);
         }
 
         if (!preview) {
@@ -191,8 +191,7 @@ bool DBusScreenSaver::Preview(const QString &name, int staysOn, bool preview)
             // 在kwin中，窗口类型为Qt::Drawer时会导致多屏情况下只会有一个窗口被显示，另一个被最小化
             // 这里判断最小化的窗口后更改其窗口类型再次显示。
             if (window->visibility() == QWindow::Minimized) {
-                window->setFlags(Qt::Dialog);
-                window->setFlags(Qt::Window);
+                window->setFlags(window->flags() & ~Qt::Dialog | Qt::Window);
                 window->close();
                 window->showFullScreen();
             }