sync: from linuxdeepin/dtkwidget

Synchronize source files from linuxdeepin/dtkwidget. Source-pull-request: linuxdeepin/dtkwidget#610
linuxdeepin · Oct 9, 2024 · 51a82bf · 51a82bf
1 parent d88429a
commit 51a82bf
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 2 deletions.
diff --git a/src/widgets/assets/icons/bloom/checkbox_checked.dci b/src/widgets/assets/icons/bloom/checkbox_checked.dci
diff --git a/src/widgets/assets/icons/bloom/checkbox_unchecked.dci b/src/widgets/assets/icons/bloom/checkbox_unchecked.dci
diff --git a/src/widgets/assets/icons/bloom/radio_checked.dci b/src/widgets/assets/icons/bloom/radio_checked.dci
diff --git a/src/widgets/assets/icons/bloom/radio_unchecked.dci b/src/widgets/assets/icons/bloom/radio_unchecked.dci
diff --git a/src/widgets/assets/icons/dtk-icon-theme.qrc b/src/widgets/assets/icons/dtk-icon-theme.qrc
@@ -74,5 +74,9 @@
         <file alias="window_normal.dci">bloom/window_normal.dci</file>
         <file alias="switch_on.dci">bloom/switch_on.dci</file>
         <file alias="switch_off.dci">bloom/switch_off.dci</file>
+        <file alias="radio_checked.dci">bloom/radio_checked.dci</file>
+        <file alias="radio_unchecked.dci">bloom/radio_unchecked.dci</file>
+        <file alias="checkbox_checked.dci">bloom/checkbox_checked.dci</file>
+        <file alias="checkbox_unchecked.dci">bloom/checkbox_unchecked.dci</file>
     </qresource>
 </RCC>
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;