sync: from linuxdeepin/dtkwidget

Synchronize source files from linuxdeepin/dtkwidget. Source-pull-request: linuxdeepin/dtkwidget#578
linuxdeepin · Jul 3, 2024 · c45fcc3 · c45fcc3
1 parent c0fd6fd
commit c45fcc3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/widgets/dabstractdialog.cpp b/src/widgets/dabstractdialog.cpp
@@ -68,6 +68,11 @@ void DAbstractDialogPrivate::init(bool blurIfPossible)
         q->setAttribute(Qt::WA_TranslucentBackground, blurIfPossible);
     } else if (noTitlebarEnabled()) {
         handle = new DPlatformWindowHandle(q, q);
+
+        if (!handle->enableBlurWindow()) {
+            handle->setEnableBlurWindow(true);
+        }
+
         // fix wayland no titlebar
         //q->setWindowFlags(q->windowFlags() | Qt::FramelessWindowHint);
     }

diff --git a/src/widgets/ddialog.cpp b/src/widgets/ddialog.cpp
@@ -125,12 +125,14 @@ void DDialogPrivate::init()
     spacer = new QSpacerItem(1, 0);
 
     // MainLayout--TopLayout
+    mainLayout->setSpacing(0);
     mainLayout->addWidget(titleBar, 0, Qt::AlignTop);
     mainLayout->addWidget(contentWidget);
     mainLayout->setContentsMargins(QMargins(0, 0, 0, 0));
 
     // MainLayout--ButtonLayout
     buttonLayout = new QHBoxLayout;
+    buttonLayout->setSpacing(5);
     buttonLayout->setContentsMargins(DIALOG::BUTTON_LAYOUT_LEFT_MARGIN,
                                      DIALOG::BUTTON_LAYOUT_TOP_MARGIN,
                                      DIALOG::BUTTON_LAYOUT_RIGHT_MARGIN,