diff --git a/src/application.cpp b/src/application.cpp index 623edb6d..82c1390f 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -351,6 +351,14 @@ bool Application::isWaylandPlatform() return true; } +/** + * @return 返回当前桌面环境为 Treeland + */ +bool Application::isTreeland() +{ + return qEnvironmentVariable("DDE_CURRENT_COMPOSITOR") == QStringLiteral("TreeLand"); +} + bool Application::isTabletSystemEnvir() { //#if (DTK_VERSION > DTK_VERSION_CHECK(5, 5, 0, 0)) diff --git a/src/application.h b/src/application.h index b9ed35ee..7bc6726e 100644 --- a/src/application.h +++ b/src/application.h @@ -166,6 +166,7 @@ class Application : public QObject static void setWidgetAccesibleName(QWidget *w, const QString &name); static bool isWaylandPlatform(); + static bool isTreeland(); static bool isTabletSystemEnvir(); diff --git a/src/deepin-draw/main.cpp b/src/deepin-draw/main.cpp index 4692b09d..11a69ab2 100644 --- a/src/deepin-draw/main.cpp +++ b/src/deepin-draw/main.cpp @@ -73,7 +73,7 @@ int main(int argc, char *argv[]) DWIDGET_INIT_RESOURCE(); #endif - if (Application::isWaylandPlatform()) { + if (Application::isWaylandPlatform() && !Application::isTreeland()) { //添加kwayland-shell,修改了窗口顶部栏无右键菜单 qputenv("QT_WAYLAND_SHELL_INTEGRATION", "kwayland-shell"); }