sync: from linuxdeepin/dtkwidget

Synchronize source files from linuxdeepin/dtkwidget. Source-pull-request: linuxdeepin/dtkwidget#599
linuxdeepin · Sep 25, 2024 · 40a4a63 · 40a4a63
1 parent 940d150
commit 40a4a63
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/widgets/dmainwindow.cpp b/src/widgets/dmainwindow.cpp
@@ -43,6 +43,9 @@ DMainWindowPrivate::DMainWindowPrivate(DMainWindow *qq)
     titlebar = new DTitlebar(qq);
     titlebar->setAccessibleName("DMainWindowTitlebar");
     auto noTitlebarEnabled = []{
+        if (qEnvironmentVariable("DDE_CURRENT_COMPOSITOR") == "TreeLand") {
+            return true;
+        }
         QFunctionPointer enableNoTitlebar = qApp->platformFunction("_d_isEnableNoTitlebar");
         bool enabled = qApp->platformName() == "dwayland" || qApp->property("_d_isDwayland").toBool();
         return enabled && enableNoTitlebar != nullptr;

diff --git a/src/widgets/dtitlebar.cpp b/src/widgets/dtitlebar.cpp
@@ -354,6 +354,10 @@ void DTitlebarPrivate::init()
     q->setFocusPolicy(Qt::StrongFocus);
 
     auto noTitlebarEnabled = []{
+        if (qEnvironmentVariable("DDE_CURRENT_COMPOSITOR") == "TreeLand") {
+            return true;
+        }
+
         QFunctionPointer enableNoTitlebar = qApp->platformFunction("_d_isEnableNoTitlebar");
         bool enabled = qApp->platformName() == "dwayland" || qApp->property("_d_isDwayland").toBool();
         return enabled && enableNoTitlebar != nullptr;
@@ -427,7 +431,7 @@ void DTitlebarPrivate::updateFullscreen()
 void DTitlebarPrivate::updateButtonsState(Qt::WindowFlags type)
 {
     D_Q(DTitlebar);
-    bool useDXcb = DPlatformWindowHandle::isEnabledDXcb(targetWindow());
+    bool useDXcb = DPlatformWindowHandle::isEnabledDXcb(targetWindow()) || qEnvironmentVariable("DDE_CURRENT_COMPOSITOR") == "TreeLand";
     bool isFullscreen = targetWindow()->windowState().testFlag(Qt::WindowFullScreen);
 
 //    bool forceShow = !useDXcb;