Skip to content

Commit

Permalink
chore: 新增进度条动效和一个新进度条类
Browse files Browse the repository at this point in the history
新增进度条动效和一个新进度条类

Log:
  • Loading branch information
Whale107 committed Jul 23, 2024
1 parent 3a01bae commit 9f42599
Show file tree
Hide file tree
Showing 7 changed files with 299 additions and 4 deletions.
1 change: 1 addition & 0 deletions include/DWidget/DIndeterminateProgressbar
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "dindeterminateprogressbar.h"
26 changes: 26 additions & 0 deletions include/widgets/dindeterminateprogressbar.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// SPDX-FileCopyrightText: 2019 - 2024 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

#ifndef DINDETERMINATEPROGRESSBAR_H
#define DINDETERMINATEPROGRESSBAR_H

#include <DObject>
#include <QWidget>

class DIndeterminateProgressbarPrivate;
class DIndeterminateProgressbar : public QWidget, public DTK_CORE_NAMESPACE::DObject

Check warning on line 12 in include/widgets/dindeterminateprogressbar.h

View workflow job for this annotation

GitHub Actions / check_job / DOXYGEN_CHECK

class DIndeterminateProgressbar is not documented!
{
Q_OBJECT
public:
explicit DIndeterminateProgressbar(QWidget *parent = nullptr);

Check warning on line 16 in include/widgets/dindeterminateprogressbar.h

View workflow job for this annotation

GitHub Actions / check_job / DOXYGEN_CHECK

function DIndeterminateProgressbar::DIndeterminateProgressbar is not documented!

protected:
void paintEvent(QPaintEvent *e) override;
void resizeEvent(QResizeEvent *e) override;

private:
D_DECLARE_PRIVATE(DIndeterminateProgressbar)
};

#endif // DINDETERMINATEPROGRESSBAR_H
13 changes: 12 additions & 1 deletion include/widgets/dprogressbar.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2019 - 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2019 - 2024 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

Expand All @@ -8,16 +8,27 @@
#include <dtkwidget_global.h>
#include <DObject>
#include <QProgressBar>
#include <QResizeEvent>
#include <QPaintEvent>

class QPropertyAnimation;
DWIDGET_BEGIN_NAMESPACE

class DProgressBarPrivate;
class DProgressBar : public QProgressBar, public DCORE_NAMESPACE::DObject
{
public:
explicit DProgressBar(QWidget *parent = nullptr);

QSize sizeHint() const override;
QSize minimumSizeHint() const override;

protected:
void resizeEvent(QResizeEvent *e) override;
void paintEvent(QPaintEvent *e) override;

private:
D_DECLARE_PRIVATE(DProgressBar)
};

DWIDGET_END_NAMESPACE
Expand Down
127 changes: 127 additions & 0 deletions src/widgets/dindeterminateprogressbar.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
// SPDX-FileCopyrightText: 2019 - 2024 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

#include "private/dindeterminateprogressbar_p.h"
#include <QPainter>
#include <QTimer>
#include <QPropertyAnimation>
#include <QDebug>
#include <QPainterPath>

const int SPOT_WIDGET_WIDTH = 200;

DIndeterminateProgressbarPrivate::DIndeterminateProgressbarPrivate(DIndeterminateProgressbar *qq)
: DObjectPrivate(qq)
, m_sliderWidget(new QWidget(qq))
, m_timer(new QTimer(qq))
, m_leftToRight(true)
, m_spotWidget(new QWidget(qq))
, m_animation(new QPropertyAnimation(m_spotWidget, "pos", qq))
{
}

DIndeterminateProgressbar::DIndeterminateProgressbar(QWidget *parent)
: QWidget(parent)
, DObject(*new DIndeterminateProgressbarPrivate(this))
{
D_D(DIndeterminateProgressbar);
d->m_spotWidget->setFixedSize(SPOT_WIDGET_WIDTH, height());
d->m_spotWidget->move(-SPOT_WIDGET_WIDTH, 0);

d->m_sliderWidget->setFixedWidth(150);
d->m_sliderWidget->move(0, 0);

d->m_timer->setInterval(10);
static int step = 0;
connect(d->m_timer, &QTimer::timeout, this, [this, d]() {
if (d->m_sliderWidget->geometry().right() >= rect().right()) {
d->m_leftToRight = false;
}

if (d->m_sliderWidget->geometry().left() <= rect().left()) {
d->m_leftToRight = true;
}

d->m_leftToRight ? step += 2 : step -= 2;
d->m_sliderWidget->move(step, 0);
});
d->m_timer->start();
}

void DIndeterminateProgressbar::resizeEvent(QResizeEvent *e)
{
D_D(DIndeterminateProgressbar);
d->m_sliderWidget->setFixedHeight(height());
d->m_spotWidget->setFixedSize(SPOT_WIDGET_WIDTH, height());

d->m_animation->setStartValue(QPoint(-SPOT_WIDGET_WIDTH, 0));
d->m_animation->setEndValue(QPoint(rect().right(), 0));
d->m_animation->setDuration(3000);
d->m_animation->setEasingCurve(QEasingCurve::InQuad);
d->m_animation->start();
connect(d->m_animation, &QPropertyAnimation::finished, this, [d]() {
d->m_animation->start();
});
QWidget::resizeEvent(e);
}

void DIndeterminateProgressbar::paintEvent(QPaintEvent *e)
{
D_D(DIndeterminateProgressbar);
QWidget::paintEvent(e);
QPainter p(this);

p.setRenderHint(QPainter::Antialiasing);
int radius = height() / 2;

p.setBrush(QColor(0, 0, 0, int(0.1 * 255)));
p.setPen(Qt::NoPen);

p.drawRoundedRect(rect(), radius, radius);

QPen pen;
pen.setWidth(2);
pen.setColor(QColor(0, 0, 0, int(0.2 * 255)));
p.setBrush(Qt::NoBrush);
p.setPen(pen);
p.drawRoundedRect(rect().marginsRemoved(QMargins(1, 1, 1, 1)), radius, radius);

p.setPen(Qt::NoPen);
p.setBrush(palette().highlight().color());
p.drawRoundedRect(d->m_sliderWidget->geometry(), radius, radius);

pen.setColor(QColor(0, 0, 0, int(0.3 * 255)));
p.setBrush(Qt::NoBrush);
p.setPen(pen);
p.drawRoundedRect(d->m_sliderWidget->geometry().marginsRemoved(QMargins(1, 1, 1, 1)), radius, radius);

if (d->m_sliderWidget->width() < d->m_spotWidget->width() / 2)
return;

QPointF pointStart(d->m_spotWidget->geometry().left(), d->m_spotWidget->geometry().center().y());
QPointF pointEnd(d->m_spotWidget->geometry().right(), d->m_spotWidget->geometry().center().y());

QColor shadowColor(0, 0, 0, int(0.15 * 255));
QColor spotColor(255, 255, 255, int(0.5 * 255));
QColor highLightColor(palette().highlight().color());

QLinearGradient linear(pointStart, pointEnd);
linear.setColorAt(0, highLightColor);
linear.setColorAt(0.35, shadowColor);
linear.setColorAt(0.5, spotColor);
linear.setColorAt(0.65, shadowColor);
linear.setColorAt(1, highLightColor);
linear.setSpread(QGradient::PadSpread);
linear.setInterpolationMode(QLinearGradient::InterpolationMode::ColorInterpolation);

p.setBrush(linear);
p.setPen(Qt::NoPen);

QPainterPath clipPath;
clipPath.addRoundedRect(d->m_sliderWidget->geometry(), radius, radius);
p.setClipPath(clipPath);
p.setClipping(true);
p.drawRoundedRect(d->m_spotWidget->geometry().marginsRemoved(QMargins(2, 2, 2, 2)), radius, radius);
p.setClipping(false);
}
80 changes: 77 additions & 3 deletions src/widgets/dprogressbar.cpp
Original file line number Diff line number Diff line change
@@ -1,13 +1,27 @@
// SPDX-FileCopyrightText: 2019 - 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2019 - 2024 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

#include "dprogressbar.h"
#include "private/dprogressbar_p.h"

#include <QStyle>
#include <QStyleOptionProgressBar>
#include <QPropertyAnimation>
#include <QDebug>
#include <QTimer>
#include <QPainter>
#include <QPainterPath>

const int SPOT_WIDGET_WIDTH = 200;

DWIDGET_BEGIN_NAMESPACE

DProgressBarPrivate::DProgressBarPrivate(DProgressBar *qq)
: DObjectPrivate(qq)
, m_spotWidget(new QWidget(qq))
, m_animation(new QPropertyAnimation(m_spotWidget, "pos", qq))
{
}
/*!
@~english
@class Dtk::Widget::DProgressBar
Expand All @@ -23,8 +37,11 @@ DWIDGET_BEGIN_NAMESPACE
*/
DProgressBar::DProgressBar(QWidget *parent)
: QProgressBar(parent)
, DObject(*new DProgressBarPrivate(this))
{

D_D(DProgressBar);
d->m_spotWidget->setFixedSize(SPOT_WIDGET_WIDTH, height());
d->m_spotWidget->move(-SPOT_WIDGET_WIDTH, 0);
}

/*!
Expand Down Expand Up @@ -57,4 +74,61 @@ QSize DProgressBar::minimumSizeHint() const
return sizeHint();
}

void DProgressBar::resizeEvent(QResizeEvent *e)
{
D_D(DProgressBar);
d->m_spotWidget->setFixedSize(SPOT_WIDGET_WIDTH, height());

d->m_animation->setStartValue(QPoint(-SPOT_WIDGET_WIDTH, 0));
d->m_animation->setEndValue(QPoint(rect().right(), 0));
d->m_animation->setDuration(2000);
d->m_animation->setEasingCurve(QEasingCurve::InQuad);
d->m_animation->start();
connect(d->m_animation, &QPropertyAnimation::finished, this, [this, d]() {
// 动画之间需要间隔1s
QTimer::singleShot(1000, this, [this, d]() {
d->m_animation->start();
});
});
QProgressBar::resizeEvent(e);
}

void DProgressBar::paintEvent(QPaintEvent *e)
{
D_D(DProgressBar);
QProgressBar::paintEvent(e);

QPainter p(this);

if (rect().right() * (qreal(value()) / qreal(maximum())) < d->m_spotWidget->width() / 2)
return;

QPointF pointStart(d->m_spotWidget->geometry().left(), d->m_spotWidget->geometry().center().y());
QPointF pointEnd(d->m_spotWidget->geometry().right(), d->m_spotWidget->geometry().center().y());

QColor shadowColor(0, 0, 0, int(0.15 * 255));
QColor spotColor(255, 255, 255, int(0.5 * 255));
QColor highLightColor(palette().highlight().color());

QLinearGradient linear(pointStart, pointEnd);
linear.setColorAt(0, highLightColor);
linear.setColorAt(0.35, shadowColor);
linear.setColorAt(0.5, spotColor);
linear.setColorAt(0.65, shadowColor);
linear.setColorAt(1, highLightColor);
linear.setSpread(QGradient::PadSpread);
linear.setInterpolationMode(QLinearGradient::InterpolationMode::ColorInterpolation);

p.setBrush(linear);
p.setPen(Qt::NoPen);
int radius = height() / 2;
int progressWidth = int(rect().right() * (qreal(value()) / qreal(maximum())));

QPainterPath clipPath;
clipPath.addRoundedRect(QRect(rect().x(), rect().y(), progressWidth, rect().height()), radius, radius);
p.setClipPath(clipPath);
p.setClipping(true);
p.drawRoundedRect(d->m_spotWidget->geometry().marginsRemoved(QMargins(2, 2, 2, 2)), radius, radius);
p.setClipping(false);
}
DWIDGET_END_NAMESPACE
29 changes: 29 additions & 0 deletions src/widgets/private/dindeterminateprogressbar_p.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// SPDX-FileCopyrightText: 2017 - 2024 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

#ifndef DINDETERMINATEPROGRESSBAR_P_H
#define DINDETERMINATEPROGRESSBAR_P_H

#include <DObjectPrivate>
#include <DIndeterminateProgressbar>

#include <QTimer>

class QPropertyAnimation;
class DIndeterminateProgressbarPrivate : public DTK_CORE_NAMESPACE::DObjectPrivate

Check warning on line 14 in src/widgets/private/dindeterminateprogressbar_p.h

View workflow job for this annotation

GitHub Actions / check_job / DOXYGEN_CHECK

class DIndeterminateProgressbarPrivate is not documented!
{
public:
DIndeterminateProgressbarPrivate(DIndeterminateProgressbar *qq);

Check warning on line 17 in src/widgets/private/dindeterminateprogressbar_p.h

View workflow job for this annotation

GitHub Actions / cppcheck

Class 'DIndeterminateProgressbarPrivate' has a constructor with 1 argument that is not explicit. Such constructors should in general be explicit for type safety reasons. Using the explicit keyword in the constructor means some mistakes when using the class can be avoided.

Check warning on line 17 in src/widgets/private/dindeterminateprogressbar_p.h

View workflow job for this annotation

GitHub Actions / check_job / DOXYGEN_CHECK

function DIndeterminateProgressbarPrivate::DIndeterminateProgressbarPrivate is not documented!

QWidget *m_sliderWidget;

Check warning on line 19 in src/widgets/private/dindeterminateprogressbar_p.h

View workflow job for this annotation

GitHub Actions / check_job / DOXYGEN_CHECK

variable QWidget* DIndeterminateProgressbarPrivate::m_sliderWidget is not documented!
QTimer *m_timer;

Check warning on line 20 in src/widgets/private/dindeterminateprogressbar_p.h

View workflow job for this annotation

GitHub Actions / check_job / DOXYGEN_CHECK

variable QTimer* DIndeterminateProgressbarPrivate::m_timer is not documented!
bool m_leftToRight;

Check warning on line 21 in src/widgets/private/dindeterminateprogressbar_p.h

View workflow job for this annotation

GitHub Actions / check_job / DOXYGEN_CHECK

variable bool DIndeterminateProgressbarPrivate::m_leftToRight is not documented!
QWidget *m_spotWidget;

Check warning on line 22 in src/widgets/private/dindeterminateprogressbar_p.h

View workflow job for this annotation

GitHub Actions / check_job / DOXYGEN_CHECK

variable QWidget* DIndeterminateProgressbarPrivate::m_spotWidget is not documented!
QPropertyAnimation *m_animation;

Check warning on line 23 in src/widgets/private/dindeterminateprogressbar_p.h

View workflow job for this annotation

GitHub Actions / cppcheck

The class 'DIndeterminateProgressbarPrivate' is unsafe, wrong usage can cause memory/resource leaks for 'DIndeterminateProgressbarPrivate::m_animation'. This can for instance be fixed by adding proper cleanup in the destructor.

Check warning on line 23 in src/widgets/private/dindeterminateprogressbar_p.h

View workflow job for this annotation

GitHub Actions / check_job / DOXYGEN_CHECK

variable QPropertyAnimation* DIndeterminateProgressbarPrivate::m_animation is not documented!

private:
D_DECLARE_PUBLIC(DIndeterminateProgressbar)
};

#endif // DINDETERMINATEPROGRESSBAR_P_H
27 changes: 27 additions & 0 deletions src/widgets/private/dprogressbar_p.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// SPDX-FileCopyrightText: 2019 - 2024 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

#ifndef DPROGRESSBAR_P_H
#define DPROGRESSBAR_P_H

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

DWIDGET_BEGIN_NAMESPACE

class DProgressBarPrivate : public DTK_CORE_NAMESPACE::DObjectPrivate
{
public:
DProgressBarPrivate(DProgressBar *qq);

Check warning on line 16 in src/widgets/private/dprogressbar_p.h

View workflow job for this annotation

GitHub Actions / cppcheck

Class 'DProgressBarPrivate' has a constructor with 1 argument that is not explicit. Such constructors should in general be explicit for type safety reasons. Using the explicit keyword in the constructor means some mistakes when using the class can be avoided.

QWidget *m_spotWidget;

Check warning on line 18 in src/widgets/private/dprogressbar_p.h

View workflow job for this annotation

GitHub Actions / check_job / DOXYGEN_CHECK

variable QWidget* Dtk::Widget::DProgressBarPrivate::m_spotWidget is not documented!
QPropertyAnimation *m_animation;

private:
D_DECLARE_PUBLIC(DProgressBar)
};

DWIDGET_END_NAMESPACE

#endif // DPROGRESSBAR_P_H

0 comments on commit 9f42599

Please sign in to comment.