sync: from linuxdeepin/dtkwidget

Synchronize source files from linuxdeepin/dtkwidget.

Source-pull-request: linuxdeepin/dtkwidget#602

Author: deepin-ci-robot

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;

src/widgets/dslider.cpp

@@ -13,6 +13,7 @@
 
 #include <DPaletteHelper>
 #include <DFontSizeManager>
+#include <DGuiApplicationHelper>
 
 DWIDGET_BEGIN_NAMESPACE
 
@@ -784,7 +785,7 @@ void SliderStrip::paintEvent(QPaintEvent *event)
     Q_UNUSED(event)
     QPainter pa(this);
     auto dpa = DPaletteHelper::instance()->palette(this);
-    QPen penLine = QPen(dpa.color(DPalette::ObviousBackground), 1);
+    QPen penLine = QPen(DGuiApplicationHelper::adjustColor(dpa.color(DPalette::ObviousBackground), 0, 0, 0, 0, 0, 0, +20), 1);
     QPen penNumber = QPen(dpa.textTips(), 1);
 
     int tickSize = fontMetrics().height() / 2;

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;
@@ -1104,7 +1108,7 @@ bool DTitlebar::eventFilter(QObject *obj, QEvent *event)
         switch (event->type()) {
         case QEvent::ShowToParent:
             d->handleParentWindowIdChange();
-            d->updateButtonsState(d->targetWindow()->windowFlags());
+            d->handleParentWindowStateChange();
             break;
         case QEvent::Resize:
             if (d->autoHideOnFullscreen) {