chore: use testAttribute instead of environment test

DGuiApplicationHelper::testAttribute(DGuiApplicationHelper::IsWaylandPlatform)
kegechen · Nov 7, 2024 · d9ba80d · d9ba80d
1 parent 0fefe17
commit d9ba80d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/widgets/dmainwindow.cpp b/src/widgets/dmainwindow.cpp
@@ -43,7 +43,7 @@ DMainWindowPrivate::DMainWindowPrivate(DMainWindow *qq)
     titlebar = new DTitlebar(qq);
     titlebar->setAccessibleName("DMainWindowTitlebar");
     auto noTitlebarEnabled = []{
-        if (qEnvironmentVariable("DDE_CURRENT_COMPOSITOR") == "TreeLand") {
+        if (DGuiApplicationHelper::testAttribute(DGuiApplicationHelper::IsWaylandPlatform)) {
             return true;
         }
         QFunctionPointer enableNoTitlebar = qApp->platformFunction("_d_isEnableNoTitlebar");

diff --git a/src/widgets/dtitlebar.cpp b/src/widgets/dtitlebar.cpp
@@ -354,7 +354,7 @@ void DTitlebarPrivate::init()
     q->setFocusPolicy(Qt::StrongFocus);
 
     auto noTitlebarEnabled = []{
-        if (qEnvironmentVariable("DDE_CURRENT_COMPOSITOR") == "TreeLand") {
+        if (DGuiApplicationHelper::testAttribute(DGuiApplicationHelper::IsWaylandPlatform)) {
             return true;
         }
 
@@ -431,7 +431,8 @@ void DTitlebarPrivate::updateFullscreen()
 void DTitlebarPrivate::updateButtonsState(Qt::WindowFlags type)
 {
     D_Q(DTitlebar);
-    bool useDXcb = DPlatformWindowHandle::isEnabledDXcb(targetWindow()) || qEnvironmentVariable("DDE_CURRENT_COMPOSITOR") == "TreeLand";
+    bool useDXcb = DPlatformWindowHandle::isEnabledDXcb(targetWindow()) ||
+                   DGuiApplicationHelper::testAttribute(DGuiApplicationHelper::IsWaylandPlatform);
     bool isFullscreen = targetWindow()->windowState().testFlag(Qt::WindowFullScreen);
 
 //    bool forceShow = !useDXcb;