sync: from linuxdeepin/dtkwidget

Synchronize source files from linuxdeepin/dtkwidget. Source-pull-request: linuxdeepin/dtkwidget#622
linuxdeepin · Nov 27, 2024 · d28324c · d28324c
1 parent 9c4d4f8
commit d28324c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 33 deletions.
diff --git a/src/widgets/dabstractdialog.cpp b/src/widgets/dabstractdialog.cpp
@@ -40,11 +40,6 @@ void DAbstractDialogPrivate::init(bool blurIfPossible)
     // TODO: 这里对dialog特殊处理，dialog不需要设置固定的位置，否则里面的坐标会发生偏移导致点击偏移
     // 但是这不是问题的根本原因，还需要进一步分析。该属性在插件中做了特殊处理
     q->QDialog::setProperty("DAbstractDialog", true);
-    auto noTitlebarEnabled = []{
-        QFunctionPointer enableNoTitlebar = qApp->platformFunction("_d_isEnableNoTitlebar");
-        bool enabled = qApp->platformName() == "dwayland" || qApp->property("_d_isDwayland").toBool();
-        return enabled && enableNoTitlebar != nullptr;
-    };
 
     if (qApp->isDXcbPlatform()) {
         handle = new DPlatformWindowHandle(q, q);
@@ -66,7 +61,7 @@ void DAbstractDialogPrivate::init(bool blurIfPossible)
 
         bgBlurWidget->setBlurEnabled(blurIfPossible);
         q->setAttribute(Qt::WA_TranslucentBackground, blurIfPossible);
-    } else if (noTitlebarEnabled()) {
+    } else if (DWindowManagerHelper::instance()->hasNoTitlebar()) {
         handle = new DPlatformWindowHandle(q, q);
 
         if (!handle->enableBlurWindow()) {

diff --git a/src/widgets/ddialog.cpp b/src/widgets/ddialog.cpp
@@ -41,7 +41,7 @@ DDialogPrivate::DDialogPrivate(DDialog *qq)
     , iconLayout(nullptr)
     , contentLayout(nullptr)
     , buttonLayout(nullptr)
-    , clickedButtonIndex(0)
+    , clickedButtonIndex(-1)
 {
 
 }
@@ -240,9 +240,9 @@ void DDialogPrivate::_q_onButtonClicked()
     if (button) {
         int index = buttonList.indexOf(button);
         q->buttonClicked(index, button->text());
+        clickedButtonIndex = index;
 
         if (onButtonClickedClose) {
-            clickedButtonIndex = index;
             q->done(clickedButtonIndex);
         }
     }
@@ -1109,19 +1109,7 @@ int DDialog::exec()
     D_D(DDialog);
 
     d->clickedButtonIndex = -1;
-    int clickedIndex = d->clickedButtonIndex;
-
-    if (d->onButtonClickedClose) {
-        // 如果设置了WA_DeleteOnClose属性，那么在exec()中将直接delete this
-        // d->clickedButtonIndex中记录的数据失效，这里通过信号槽更新正确的数据
-        connect(this, &DDialog::buttonClicked, this, [ &clickedIndex ] (int index, const QString &) {
-                clickedIndex = index;
-        });
-    }
-
-    int code = DAbstractDialog::exec();
-
-    return clickedIndex >= 0 ? clickedIndex : code;
+    return DAbstractDialog::exec();
 }
 
 void DDialog::setCloseButtonVisible(bool closeButtonVisible)
@@ -1163,10 +1151,11 @@ void DDialog::hideEvent(QHideEvent *event)
 void DDialog::closeEvent(QCloseEvent *event)
 {
     Q_UNUSED(event)
+    Q_D(DDialog);
 
     Q_EMIT aboutToClose();
 
-    done(-1);
+    done(d->clickedButtonIndex);
 
     Q_EMIT visibleChanged(isVisible());
     Q_EMIT closed();

diff --git a/src/widgets/dfloatingmessage.cpp b/src/widgets/dfloatingmessage.cpp
@@ -12,6 +12,7 @@
 #include <QLabel>
 #include <QDebug>
 #include <QGraphicsDropShadowEffect>
+#include <QWindow>
 
 class MessageLabel : public QLabel
 {
@@ -83,7 +84,9 @@ void DFloatingMessagePrivate::init()
 
         if(ENABLE_ANIMATIONS && ENABLE_ANIMATION_MESSAGE)
             q->connect(closeButton, &DIconButton::clicked, q, [q]() {
-                q->close();
+                if (q->windowHandle()) {
+                    q->windowHandle()->close();
+                }
                 Q_EMIT q->messageClosed();
             });
         else

diff --git a/src/widgets/dmainwindow.cpp b/src/widgets/dmainwindow.cpp
@@ -24,6 +24,7 @@
 #include <qwidgetaction.h>
 #include <QScreen>
 
+#include <DWindowManagerHelper>
 #include <DAnchors>
 #include <DConfig>
 
@@ -42,15 +43,8 @@ DMainWindowPrivate::DMainWindowPrivate(DMainWindow *qq)
 {
     titlebar = new DTitlebar(qq);
     titlebar->setAccessibleName("DMainWindowTitlebar");
-    auto noTitlebarEnabled = []{
-        if (DGuiApplicationHelper::testAttribute(DGuiApplicationHelper::IsWaylandPlatform)) {
-            return true;
-        }
-        QFunctionPointer enableNoTitlebar = qApp->platformFunction("_d_isEnableNoTitlebar");
-        bool enabled = qApp->platformName() == "dwayland" || qApp->property("_d_isDwayland").toBool();
-        return enabled && enableNoTitlebar != nullptr;
-    };
-    if (DApplication::isDXcbPlatform() || noTitlebarEnabled()) {
+
+    if (DApplication::isDXcbPlatform() || DWindowManagerHelper::instance()->hasNoTitlebar()) {
         handle = new DPlatformWindowHandle(qq, qq);
         qq->setMenuWidget(titlebar);
     } else {

diff --git a/src/widgets/dtitlebar.cpp b/src/widgets/dtitlebar.cpp
@@ -1533,7 +1533,12 @@ void DTitlebar::setVisible(bool visible)
         connect(d->maxButton, SIGNAL(clicked()), this, SLOT(_q_toggleWindowState()), Qt::UniqueConnection);
         connect(this, SIGNAL(doubleClicked()), this, SLOT(_q_toggleWindowState()), Qt::UniqueConnection);
         connect(d->minButton, SIGNAL(clicked()), this, SLOT(_q_showMinimized()), Qt::UniqueConnection);
-        connect(d->closeButton, &DWindowCloseButton::clicked, d->targetWindow(), &QWidget::close, Qt::UniqueConnection);
+        connect(d->closeButton, &DWindowCloseButton::clicked, d->targetWindow(), [this]() {
+            D_D(DTitlebar);
+            if (d->closeButton->windowHandle()) {
+                d->closeButton->windowHandle()->close();
+            }
+        }, Qt::UniqueConnection);
 
         d->updateButtonsState(d->targetWindow()->windowFlags());
     } else {