sync: from linuxdeepin/dtkwidget

Synchronize source files from linuxdeepin/dtkwidget.

Source-pull-request: linuxdeepin/dtkwidget#656

Author: deepin-ci-robot

src/widgets/dlabel.cpp

@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
 #include "dlabel.h"
-#include "private/dlabel_p.h"
 #include "dtooltip.h"
+#include "private/dlabel_p.h"
 
 #include <DPaletteHelper>
 
@@ -257,48 +257,73 @@ void DLabel::paintEvent(QPaintEvent *event)
         }
     } else
 #endif
-    if (d->pixmap && !d->pixmap->isNull()) {
-        QPixmap pix;
-        if (d->scaledcontents) {
-            QSize scaledSize = cr.size() * devicePixelRatioF();
-            if (!d->scaledpixmap || d->scaledpixmap->size() != scaledSize) {
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
+        if (d->pixmap && !d->pixmap->isNull()) {
+#else
+        if (d->icon && !d->icon->isNull()) {
+#endif
+      QPixmap pix;
+      if (d->scaledcontents) {
+        const auto dpr = devicePixelRatioF();
+        QSize scaledSize = cr.size() * dpr;
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
+      if (!d->scaledpixmap || d->scaledpixmap->size() != scaledSize) {
+#else
+      auto mode = isEnabled() ? QIcon::Normal : QIcon::Disabled;
+      pix = d->icon->pixmap(scaledSize, dpr, mode);
+      if (d->scaledcontents && pix.size() != cr.size() * dpr) {
+#endif
 #if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
-                if (!d->cachedimage)
+        if (!d->cachedimage)
 #endif
 #if QT_VERSION < QT_VERSION_CHECK(6, 4, 2)
-                    d->cachedimage = new QImage(d->pixmap->toImage());
-                delete d->scaledpixmap;
+          d->cachedimage = new QImage(d->pixmap->toImage());
+        delete d->scaledpixmap;
 #else
 #if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
-                    d->cachedimage = QImage(d->pixmap->toImage());
+        d->cachedimage = QImage(d->pixmap->toImage());
 #endif
-                d->scaledpixmap.reset();
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
+        d->scaledpixmap.reset();
 #endif
+#endif
+
 #if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
-                QImage scaledImage =
-                    d->cachedimage->scaled(scaledSize,
-                                           Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+        QImage scaledImage = d->cachedimage->scaled(
+            scaledSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+#elif QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
+        QImage scaledImage = d->pixmap->scaled(
+            scaledSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
 #else
-                    d->scaledpixmap = d->pixmap->scaled(scaledSize,
-                                            Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+      pix = pix.scaled(scaledSize, Qt::IgnoreAspectRatio,
+                       Qt::SmoothTransformation);
+      pix.setDevicePixelRatio(dpr);
+      d->icon->addPixmap(pix, mode);
 #endif
 #if QT_VERSION < QT_VERSION_CHECK(6, 4, 2)
-                d->scaledpixmap = new QPixmap(QPixmap::fromImage(scaledImage));
+        d->scaledpixmap = new QPixmap(QPixmap::fromImage(scaledImage));
+#elif QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
+        d->scaledpixmap = QPixmap(QPixmap::fromImage(scaledImage));
+#endif
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
+        d->scaledpixmap->setDevicePixelRatio(dpr);
+#endif
+      }
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
+      pix = *d->scaledpixmap;
+    } else {
+      pix = *d->pixmap;
+    }
 #else
-#if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
-                d->scaledpixmap = QPixmap(QPixmap::fromImage(scaledImage));
+    }
 #endif
+    QStyleOption opt;
+    opt.initFrom(this);
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
+    if (!isEnabled())
+      pix = style->generatedIconPixmap(QIcon::Disabled, pix, &opt);
 #endif
-                d->scaledpixmap->setDevicePixelRatio(devicePixelRatioF());
-            }
-            pix = *d->scaledpixmap;
-        } else
-            pix = *d->pixmap;
-        QStyleOption opt;
-        opt.initFrom(this);
-        if (!isEnabled())
-            pix = style->generatedIconPixmap(QIcon::Disabled, pix, &opt);
-        style->drawItemPixmap(&painter, cr, align, pix);
+    style->drawItemPixmap(&painter, cr, align, pix);
     }
 }
 

src/widgets/dtitlebarsettings.cpp

@@ -60,6 +60,6 @@ DTitlebarSettingsImpl *DTitlebarSettings::impl()
     return d->impl;
 }
 
-#include "moc_dtitlebarsettings.cpp"
-
 DWIDGET_END_NAMESPACE
+
+#include "moc_dtitlebarsettings.cpp"