From bbc19220eafd58bdbb028e2f0d7329bb47036148 Mon Sep 17 00:00:00 2001
From: deepin-ci-robot <packages@deepin.org>
Date: Tue, 8 Oct 2024 05:14:19 +0000
Subject: [PATCH] sync: from linuxdeepin/dtkwidget

Synchronize source files from linuxdeepin/dtkwidget.

Source-pull-request: https://github.com/linuxdeepin/dtkwidget/pull/606
---
 src/widgets/dbounceanimation.cpp | 2 +-
 src/widgets/dmessagemanager.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/widgets/dbounceanimation.cpp b/src/widgets/dbounceanimation.cpp
index d574375a..496d602f 100644
--- a/src/widgets/dbounceanimation.cpp
+++ b/src/widgets/dbounceanimation.cpp
@@ -50,7 +50,7 @@ bool DBounceAnimation::eventFilter(QObject *o, QEvent *e)
         if (auto absscroll = dynamic_cast<QAbstractScrollArea *>(o)) {
             if (auto wheelEvent = dynamic_cast<QWheelEvent *>(e)) {
                 if (absscroll->verticalScrollBar()->value() <= 0 || absscroll->verticalScrollBar()->value() >= absscroll->verticalScrollBar()->maximum()) {
-                    d->m_deltaSum += wheelEvent->delta();
+                    d->m_deltaSum += wheelEvent->pixelDelta().x() != 0 ? wheelEvent->pixelDelta().x() : wheelEvent->pixelDelta().y();
                     bounceBack(wheelEvent->angleDelta().x() == 0 ? Qt::Vertical : Qt::Horizontal);
                 }
             }
diff --git a/src/widgets/dmessagemanager.cpp b/src/widgets/dmessagemanager.cpp
index 043731e8..f5147241 100644
--- a/src/widgets/dmessagemanager.cpp
+++ b/src/widgets/dmessagemanager.cpp
@@ -37,7 +37,7 @@ class ImageLabel : public QLabel {
         QPainter p(this);
         p.setRenderHint(QPainter::Antialiasing);
         p.setOpacity(m_opacity);
-        p.drawPixmap(rect().marginsRemoved(contentsMargins()), *pixmap());
+        p.drawPixmap(rect().marginsRemoved(contentsMargins()), pixmap(Qt::ReturnByValue));
     };
 private:
     qreal m_opacity;