sync: from linuxdeepin/dtkwidget

Synchronize source files from linuxdeepin/dtkwidget. Source-pull-request: linuxdeepin/dtkwidget#608
linuxdeepin · Oct 8, 2024 · bfaf86a · bfaf86a
1 parent d88429a
commit bfaf86a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -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;

diff --git a/src/widgets/dswitchbutton.cpp b/src/widgets/dswitchbutton.cpp
@@ -58,6 +58,12 @@ void DSwitchButton::paintEvent(QPaintEvent *e)
     DStylePainter painter(this);
     DStyleOptionButton opt;
     initStyleOption(&opt);
+    if (isChecked() != d->checked) {
+        d->checked = isChecked();
+        DDciIcon icon = !d->checked ? DDciIcon::fromTheme("switch_on") : DDciIcon::fromTheme("switch_off");
+        d->player.setIcon(icon);
+        Q_EMIT checkedChanged(d->checked);
+    }
     painter.drawControl(DStyle::CE_SwitchButton, opt);
 
     painter.setRenderHint(QPainter::SmoothPixmapTransform);