Some change in wayland environment(dde-desktop)

GXDE-OS · Oct 6, 2024 · f2fd5f4 · f2fd5f4
1 parent 01f747a
commit f2fd5f4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/dde-desktop/desktop.cpp b/dde-desktop/desktop.cpp
@@ -101,20 +101,24 @@ void Desktop::onBackgroundEnableChanged()
         QMetaObject::invokeMethod(background, "raise", Qt::QueuedConnection);
 
         // 隐藏完全重叠的窗口
-        for (QLabel *l : d->background->allBackgrounds()) {
-            if (l != background) {
-                Xcb::XcbMisc::instance().set_window_transparent_input(l->winId(), true);
-                l->setVisible(!background->geometry().contains(l->geometry()));
-            } else {
-                Xcb::XcbMisc::instance().set_window_transparent_input(l->winId(), false);
-                l->show();
+        if (qgetenv("XDG_SESSION_TYPE") != "wayland") {
+            for (QLabel *l : d->background->allBackgrounds()) {
+                if (l != background) {
+                    Xcb::XcbMisc::instance().set_window_transparent_input(l->winId(), true);
+                    l->setVisible(!background->geometry().contains(l->geometry()));
+                } else {
+                    Xcb::XcbMisc::instance().set_window_transparent_input(l->winId(), false);
+                    l->show();
+                }
             }
         }
     } else {
         d->screenFrame.setParent(nullptr);
         setWindowFlag(&d->screenFrame, Qt::FramelessWindowHint, true);
         d->screenFrame.QWidget::setGeometry(qApp->primaryScreen()->geometry());
-        Xcb::XcbMisc::instance().set_window_type(d->screenFrame.winId(), Xcb::XcbMisc::Desktop);
+        if (qgetenv("XDG_SESSION_TYPE") != "wayland") {
+            Xcb::XcbMisc::instance().set_window_type(d->screenFrame.winId(), Xcb::XcbMisc::Desktop);
+        }
         QWindow::fromWinId(d->screenFrame.winId())->setOpacity(0.99);
         d->screenFrame.show();
     }

diff --git a/dde-desktop/view/backgroundhelper.cpp b/dde-desktop/view/backgroundhelper.cpp
@@ -255,7 +255,9 @@ void BackgroundHelper::onScreenAdded(QScreen *screen)
     if (m_previuew) {
         l->setWindowFlags(l->windowFlags() | Qt::BypassWindowManagerHint | Qt::WindowDoesNotAcceptFocus);
     } else {
-        Xcb::XcbMisc::instance().set_window_type(l->winId(), Xcb::XcbMisc::Desktop);
+        if (qgetenv("XDG_SESSION_TYPE") != "wayland") {
+            Xcb::XcbMisc::instance().set_window_type(l->winId(), Xcb::XcbMisc::Desktop);
+        }
     }
 
     if (m_visible)