fix: hide the power button in treeland

Temporarily hide the power button in treenland Log: hide the power button in treeland
linuxdeepin · Nov 15, 2024 · 6fa3c9c · 6fa3c9c
1 parent 1be2f93
commit 6fa3c9c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/desktopintegration.cpp b/desktopintegration.cpp
@@ -10,6 +10,7 @@
 #include <DStandardPaths>
 #include <DDesktopServices>
 #include <QRect>
+#include <QGuiApplication>
 #include <appinfo.h>
 #include <appmgr.h>
 
@@ -28,7 +29,7 @@ QString DesktopIntegration::currentDE()
 
 bool DesktopIntegration::isTreeLand()
 {
-    return qEnvironmentVariable("DDE_CURRENT_COMPOSITOR") == QStringLiteral("TreeLand");
+    return QGuiApplication::platformName() == "wayland";
 }
 
 void DesktopIntegration::openShutdownScreen()

diff --git a/launchercontroller.cpp b/launchercontroller.cpp
@@ -11,6 +11,7 @@
 #include <DGuiApplicationHelper>
 #include <QCommandLineParser>
 #include <launcher1adaptor.h>
+#include "desktopintegration.h"
 
 DGUI_USE_NAMESPACE
 
@@ -28,9 +29,6 @@ LauncherController::LauncherController(QObject *parent)
     QSettings settings(settingPath, QSettings::NativeFormat);
 
     m_currentFrame = settings.value("current_frame", "WindowedFrame").toString();
-    if (qgetenv("DDE_CURRENT_COMPOSITOR") == "TreeLand") {
-        m_currentFrame = QStringLiteral("FullscreenFrame");
-    }
 
     // Interval set to 500=>1000ms for issue https://github.com/linuxdeepin/developer-center/issues/8137
     m_timer->setInterval(1000);

diff --git a/qml/windowed/BottomBar.qml b/qml/windowed/BottomBar.qml
@@ -31,6 +31,8 @@ Control {
             ToolTip.delay: 1000
             ToolTip.text: qsTr("Power")
             Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+            // TODO: remove this when treeland is supported
+            visible: !DesktopIntegration.isTreeLand()
             onClicked: {
                 DesktopIntegration.openShutdownScreen();
             }