sync: from linuxdeepin/dtkwidget

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

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/widgets/daboutdialog.cpp b/src/widgets/daboutdialog.cpp
@@ -461,7 +461,7 @@ void DAboutDialog::setProductIcon(const QIcon &icon)
 #else
     winId(); // TODO: wait for checking
     auto window = windowHandle();
-    d->logoLabel->setPixmap(icon.pixmap(window->baseSize(), window->screen()->devicePixelRatio()));
+    d->logoLabel->setPixmap(icon.pixmap(QSize(128, 128), window->screen()->devicePixelRatio()));
 #endif
 }
 

diff --git a/src/widgets/dmessagemanager.cpp b/src/widgets/dmessagemanager.cpp
@@ -68,17 +68,21 @@ template<typename IconType>
 static void sendMessage_helper(DMessageManager *manager, QWidget *par, IconType icon, const QString &message)
 {
     QWidget *content = par->findChild<QWidget *>(D_MESSAGE_MANAGER_CONTENT, Qt::FindDirectChildrenOnly);
-    int text_message_count = 0;
 
-    for (DFloatingMessage *message : content->findChildren<DFloatingMessage*>(QString(), Qt::FindDirectChildrenOnly)) {
-        if (message->messageType() == DFloatingMessage::TransientType) {
-            ++text_message_count;
+    if (content) {
+        int text_message_count = 0;
+
+        for (DFloatingMessage *message : content->findChildren<DFloatingMessage *>(QString(), Qt::FindDirectChildrenOnly)) {
+            if (message->messageType() == DFloatingMessage::TransientType) {
+                ++text_message_count;
+            }
         }
-    }
 
-    // TransientType 类型的通知消息，最多只允许同时显示三个
-    if (text_message_count >= 3)
-        return;
+        // TransientType 类型的通知消息，最多只允许同时显示三个
+        if (text_message_count >= 3) {
+            return;
+        }
+    }
 
     DFloatingMessage *floMsg = new DFloatingMessage(DFloatingMessage::TransientType);
     floMsg->setAttribute(Qt::WA_DeleteOnClose);