From 76360e8b6e3a1d5810da05c71500f8a1af4d40ce Mon Sep 17 00:00:00 2001 From: echengqi Date: Fri, 13 Dec 2024 13:49:43 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20DDE=E9=80=82=E9=85=8DTreeland?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Treeland下,wm接口直接返回 Log: DDE适配Treeland pms: TASK-361827 --- src/dde-session/impl/wmswitcher.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/dde-session/impl/wmswitcher.cpp b/src/dde-session/impl/wmswitcher.cpp index 9dd2e81..bd5b1d4 100644 --- a/src/dde-session/impl/wmswitcher.cpp +++ b/src/dde-session/impl/wmswitcher.cpp @@ -3,6 +3,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later #include "wmswitcher.h" +#include "utils/utils.h" #include #include @@ -24,16 +25,27 @@ WMSwitcher::WMSwitcher(QObject *parent) bool WMSwitcher::AllowSwitch() const { - return m_wmInter->compositingPossible(); + if (Utils::IS_WAYLAND_DISPLAY) { + return false; + } else { + return m_wmInter->compositingPossible(); + } } QString WMSwitcher::CurrentWM() const { - return m_wmInter->compositingEnabled() ? WM_NAME_3D : WM_NAME_2D; + if (Utils::IS_WAYLAND_DISPLAY) { + return QString(); + } else { + return m_wmInter->compositingEnabled() ? WM_NAME_3D : WM_NAME_2D; + } } void WMSwitcher::RequestSwitchWM() const { + if (Utils::IS_WAYLAND_DISPLAY) + return; + showOSD("SwitchWM"); }