From 49163f61fa41436d607b718e433feb69cf267057 Mon Sep 17 00:00:00 2001 From: renbin Date: Mon, 19 Aug 2024 13:11:57 +0800 Subject: [PATCH] feat: adapt treeland Adapt Treeland, disable kwayland-shell in Treeland enviroment. Log: Adapt Treeland. Influence: Treeland --- src/application.cpp | 8 ++++++++ src/application.h | 1 + src/deepin-draw/main.cpp | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/application.cpp b/src/application.cpp index 623edb6d4..82c1390fa 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 b9ed35ee6..7bc6726e5 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 4692b09dc..11a69ab2d 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"); }