sync: from linuxdeepin/dtkwidget

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

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/include/widgets/dswitchbutton.h b/include/widgets/dswitchbutton.h
@@ -30,6 +30,7 @@ class LIBDTKWIDGETSHARED_EXPORT DSwitchButton : public QAbstractButton, public D
 protected:
  void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE;
  void initStyleOption(DStyleOptionButton *option) const;
+ void checkStateSet() Q_DECL_OVERRIDE;
 
 private:
  D_DECLARE_PRIVATE(DSwitchButton)

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
@@ -94,6 +94,18 @@ void DSwitchButton::initStyleOption(DStyleOptionButton *option) const
  option->rect.adjust(4, 4, -4, -4);
 }
 
+void DSwitchButton::checkStateSet()
+{
+ D_D(DSwitchButton);
+ if (isChecked() == d->checked) {
+ return;
+ }
+ d->checked = isChecked();
+ DDciIcon icon = !d->checked ? DDciIcon::fromTheme("switch_on") : DDciIcon::fromTheme("switch_off");
+ d->player.setIcon(icon);
+}
+
+
 DSwitchButtonPrivate::DSwitchButtonPrivate(DSwitchButton *qq)
  : DObjectPrivate(qq)
 {