feat: support Qt 6.8

support qt 6.8 Log:
linuxdeepin · Oct 14, 2024 · 05c746c · 05c746c
1 parent 87fd9f3
commit 05c746c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/widgets/dlabel.cpp b/src/widgets/dlabel.cpp
@@ -262,21 +262,32 @@ void DLabel::paintEvent(QPaintEvent *event)
         if (d->scaledcontents) {
             QSize scaledSize = cr.size() * devicePixelRatioF();
             if (!d->scaledpixmap || d->scaledpixmap->size() != scaledSize) {
+#if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
                 if (!d->cachedimage)
+#endif
 #if QT_VERSION < QT_VERSION_CHECK(6, 4, 2)
                     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());
+#endif
                 d->scaledpixmap.reset();
 #endif
+#if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
                 QImage scaledImage =
                     d->cachedimage->scaled(scaledSize,
                                            Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+#else
+                    d->scaledpixmap = d->pixmap->scaled(scaledSize,
+                                            Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+#endif
 #if QT_VERSION < QT_VERSION_CHECK(6, 4, 2)
                 d->scaledpixmap = new QPixmap(QPixmap::fromImage(scaledImage));
 #else
+#if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
                 d->scaledpixmap = QPixmap(QPixmap::fromImage(scaledImage));
+#endif
 #endif
                 d->scaledpixmap->setDevicePixelRatio(devicePixelRatioF());
             }

diff --git a/src/widgets/dsimplelistview.cpp b/src/widgets/dsimplelistview.cpp
@@ -955,10 +955,10 @@ void DSimpleListView::mouseMoveEvent(QMouseEvent *mouseEvent)
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
                 auto point = QPoint{mouseEvent->x() - columnRenderX, d->renderOffset + mouseEvent->y() - hoverItemIndex * d->rowHeight};
 #else
-                auto point = QPoint{mouseEvent->position().x() - columnRenderX,
+                auto point = QPointF{mouseEvent->position().x() - columnRenderX,
                                          d->renderOffset + mouseEvent->position().y() - hoverItemIndex * d->rowHeight};
 #endif
-                mouseHoverChanged(d->mouseHoverItem, item, columnCounter,point);
+                mouseHoverChanged(d->mouseHoverItem, item, columnCounter,point.toPoint());
                 d->mouseHoverItem = item;
 
                 if (d->lastHoverItem == NULL || !item->sameAs(d->lastHoverItem) || columnCounter != d->lastHoverColumnIndex) {
@@ -1235,10 +1235,10 @@ void DSimpleListView::mouseReleaseEvent(QMouseEvent *mouseEvent)
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         auto point = QPoint{mouseEvent->x() - columnRenderX, d->renderOffset + mouseEvent->y() - releaseItemIndex * d->rowHeight};
 #else
-        auto point = QPoint{mouseEvent->position().x() - columnRenderX,
+        auto point = QPointF{mouseEvent->position().x() - columnRenderX,
                                    d->renderOffset + mouseEvent->position().y() - releaseItemIndex * d->rowHeight};
 #endif
-        mouseReleaseChanged((*d->renderItems)[releaseItemIndex], columnCounter, point);
+        mouseReleaseChanged((*d->renderItems)[releaseItemIndex], columnCounter, point.toPoint());
     }
 }