Skip to content

Commit

Permalink
chore: 增加滚动区域滚轮滚动到顶部或底部的回弹效果 (linuxdeepin#596)
Browse files Browse the repository at this point in the history
增加滚动区域滚轮滚动到顶部或底部的回弹效果

Log:
  • Loading branch information
Whale107 committed Sep 23, 2024
1 parent 245c049 commit a951958
Show file tree
Hide file tree
Showing 5 changed files with 169 additions and 0 deletions.
1 change: 1 addition & 0 deletions include/DWidget/DBounceAnimation
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "dbounceanimation.h"
31 changes: 31 additions & 0 deletions include/widgets/dbounceanimation.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later
#ifndef DBOUNCEANIMATION_H
#define DBOUNCEANIMATION_H

#include <DObject>
#include <QObject>

class QPropertyAnimation;
class QAbstractScrollArea;
class DBounceAnimationPrivate;
class DBounceAnimation : public QObject, public DTK_CORE_NAMESPACE::DObject
{
Q_OBJECT
public:
explicit DBounceAnimation(QObject *parent = nullptr);

void setAnimationTarget(QAbstractScrollArea *w);
void setAniMationEnable(bool enable);

protected:
bool eventFilter(QObject *o, QEvent *e) override;
void bounceBack(Qt::Orientation orientation);

private:
D_DECLARE_PRIVATE(DBounceAnimation)

};

#endif // DBOUNCEANIMATION_H
107 changes: 107 additions & 0 deletions src/widgets/dbounceanimation.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later
#include "private/dbounceanimation_p.h"
#include <QPropertyAnimation>
#include <QEvent>
#include <QDebug>
#include <QAbstractScrollArea>
#include <QScrollBar>
#include <QWheelEvent>
#include <QTimer>

DBounceAnimationPrivate::DBounceAnimationPrivate(DBounceAnimation *qq)
: DObjectPrivate (qq)
, m_animation(nullptr)
, m_animationTarget(nullptr)
, m_deltaSum(0)
{
}

DBounceAnimation::DBounceAnimation(QObject *parent)
: QObject(parent)
, DObject(*new DBounceAnimationPrivate(this))
{
}

void DBounceAnimation::setAnimationTarget(QAbstractScrollArea *w)
{
D_D(DBounceAnimation);
if (!w)
return;

if (d->m_animationTarget == w)
return;

d->m_animationTarget = w;
}

void DBounceAnimation::setAniMationEnable(bool enable)
{
D_D(DBounceAnimation);
enable ? d->m_animationTarget->installEventFilter(this)
: d->m_animationTarget->removeEventFilter(this);
}

bool DBounceAnimation::eventFilter(QObject *o, QEvent *e)
{
D_D(DBounceAnimation);
if (e->type() == QEvent::Wheel) {
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();
bounceBack(wheelEvent->angleDelta().x() == 0 ? Qt::Vertical : Qt::Horizontal);
}
}
}
}

return false;
}

void DBounceAnimation::bounceBack(Qt::Orientation orientation)
{
D_D(DBounceAnimation);
if (d->m_animation)
return;

if (orientation & Qt::Vertical && d->m_animationTarget->verticalScrollBar()->maximum() == d->m_animationTarget->verticalScrollBar()->minimum())
return;

if (orientation & Qt::Horizontal && d->m_animationTarget->horizontalScrollBar()->maximum() == d->m_animationTarget->horizontalScrollBar()->minimum())
return;

d->m_animation = new QPropertyAnimation(this);
d->m_animation->setTargetObject(d->m_animationTarget->viewport());
d->m_animation->setPropertyName("pos");
d->m_animation->setDuration(100);
d->m_animation->setEasingCurve(QEasingCurve::InQuart);
d->m_animation->setStartValue(QPoint(d->m_animationTarget->viewport()->x(), d->m_animationTarget->viewport()->y()));

QTimer::singleShot(100, this, [this, d, orientation]() {

if (orientation & Qt::Vertical) {
d->m_animation->setEndValue(
QPoint(d->m_animationTarget->viewport()->x(), d->m_animationTarget->viewport()->y() + d->m_deltaSum / 16));
} else {
d->m_animation->setEndValue(
QPoint(d->m_animationTarget->viewport()->x() + d->m_deltaSum / 16, d->m_animationTarget->viewport()->y()));
}

d->m_animation->start();

connect(d->m_animation, &QPropertyAnimation::finished, this, [d]() {
if (d->m_animation->direction() == QPropertyAnimation::Backward) {
delete d->m_animation;
d->m_animation = nullptr;
return;
}

d->m_animation->setDirection(QPropertyAnimation::Direction::Backward);
d->m_animation->setDuration(1000);
d->m_animation->start(QPropertyAnimation::DeleteWhenStopped);
d->m_deltaSum = 0;
});
});
}
7 changes: 7 additions & 0 deletions src/widgets/dlistview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
#include "dstyleditemdelegate.h"
#include "dstyle.h"

#include <DBounceAnimation>

DWIDGET_BEGIN_NAMESPACE

DVariantListModel::DVariantListModel(QObject *parent) :
Expand Down Expand Up @@ -196,6 +198,11 @@ DListView::DListView(QWidget *parent) :
DObject(*new DListViewPrivate(this))
{
d_func()->init();
if (!qEnvironmentVariableIsSet("DTK_DISABLE_LISTVIEW_ANIMATION")) {
auto ani = new DBounceAnimation(this);
ani->setAnimationTarget(this);
ani->setAniMationEnable(true);
}
}

/*!
Expand Down
23 changes: 23 additions & 0 deletions src/widgets/private/dbounceanimation_p.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later
#ifndef DBOUNCEANIMATION_P_H
#define DBOUNCEANIMATION_P_H

#include "dbounceanimation.h"
#include <DObjectPrivate>

class DBounceAnimationPrivate : public DTK_CORE_NAMESPACE::DObjectPrivate
{
public:
DBounceAnimationPrivate(DBounceAnimation *qq);

QPropertyAnimation *m_animation;
QAbstractScrollArea *m_animationTarget;
int m_deltaSum;

private:
D_DECLARE_PUBLIC(DBounceAnimation)
};

#endif // DBOUNCEANIMATION_P_H

0 comments on commit a951958

Please sign in to comment.