Skip to content

Commit 227329e

Browse files
committed
update
1 parent 8b99ff3 commit 227329e

18 files changed

+181
-209
lines changed

components/materiallib/qtmaterialoverlaywidget.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#include <QEvent>
33

44
/*!
5-
* \class QtMaterialOverlayWidget
6-
* \internal
5+
* @class QtMaterialOverlayWidget
6+
* @internal
77
*/
88

99
QtMaterialOverlayWidget::QtMaterialOverlayWidget(QWidget *parent)
@@ -17,7 +17,7 @@ QtMaterialOverlayWidget::QtMaterialOverlayWidget(QWidget *parent)
1717
QtMaterialOverlayWidget::~QtMaterialOverlayWidget() {}
1818

1919
/*!
20-
* \reimp
20+
* @reimp
2121
*/
2222
bool QtMaterialOverlayWidget::event(QEvent *event)
2323
{
@@ -41,7 +41,7 @@ bool QtMaterialOverlayWidget::event(QEvent *event)
4141
}
4242

4343
/*!
44-
* \reimp
44+
* @reimp
4545
*/
4646
bool QtMaterialOverlayWidget::eventFilter(QObject *obj, QEvent *event)
4747
{

components/qtmaterialcircularprogress.cpp

Lines changed: 27 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#include "qtmaterialcircularprogress.h"
2+
#include "lib/qtmaterialstyle.h"
3+
#include "qtmaterialcircularprogress_internal.h"
24
#include "qtmaterialcircularprogress_p.h"
3-
#include <QPropertyAnimation>
4-
#include <QParallelAnimationGroup>
55
#include <QPainter>
66
#include <QPainterPath>
7-
#include "qtmaterialcircularprogress_internal.h"
8-
#include "lib/qtmaterialstyle.h"
7+
#include <QParallelAnimationGroup>
8+
#include <QPropertyAnimation>
99

1010
/*!
1111
* \class QtMaterialCircularProgressPrivate
@@ -17,22 +17,19 @@ QtMaterialCircularProgressPrivate::QtMaterialCircularProgressPrivate(QtMaterialC
1717
{
1818
}
1919

20-
QtMaterialCircularProgressPrivate::~QtMaterialCircularProgressPrivate()
21-
{
22-
}
20+
QtMaterialCircularProgressPrivate::~QtMaterialCircularProgressPrivate() {}
2321

2422
void QtMaterialCircularProgressPrivate::init()
2523
{
2624
Q_Q(QtMaterialCircularProgress);
2725

28-
delegate = new QtMaterialCircularProgressDelegate(q);
29-
progressType = Material::IndeterminateProgress;
30-
penWidth = 6.25;
31-
size = 64;
26+
delegate = new QtMaterialCircularProgressDelegate(q);
27+
progressType = Material::IndeterminateProgress;
28+
penWidth = 6.25;
29+
size = 64;
3230
useThemeColors = true;
3331

34-
q->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,
35-
QSizePolicy::MinimumExpanding));
32+
q->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
3633

3734
QParallelAnimationGroup *group = new QParallelAnimationGroup(q);
3835
group->setLoopCount(-1);
@@ -82,15 +79,13 @@ void QtMaterialCircularProgressPrivate::init()
8279
*/
8380

8481
QtMaterialCircularProgress::QtMaterialCircularProgress(QWidget *parent)
85-
: QProgressBar(parent),
86-
d_ptr(new QtMaterialCircularProgressPrivate(this))
82+
: QProgressBar(parent)
83+
, d_ptr(new QtMaterialCircularProgressPrivate(this))
8784
{
8885
d_func()->init();
8986
}
9087

91-
QtMaterialCircularProgress::~QtMaterialCircularProgress()
92-
{
93-
}
88+
QtMaterialCircularProgress::~QtMaterialCircularProgress() {}
9489

9590
void QtMaterialCircularProgress::setProgressType(Material::ProgressType type)
9691
{
@@ -186,7 +181,7 @@ QSize QtMaterialCircularProgress::sizeHint() const
186181
{
187182
Q_D(const QtMaterialCircularProgress);
188183

189-
const qreal s = d->size+d->penWidth+8;
184+
const qreal s = d->size + d->penWidth + 8;
190185
return QSize(s, s);
191186
}
192187

@@ -202,21 +197,19 @@ void QtMaterialCircularProgress::paintEvent(QPaintEvent *event)
202197
QPainter painter(this);
203198
painter.setRenderHint(QPainter::Antialiasing);
204199

205-
if (!isEnabled())
206-
{
200+
if (!isEnabled()) {
207201
QPen pen;
208202
pen.setCapStyle(Qt::RoundCap);
209203
pen.setWidthF(d->penWidth);
210204
pen.setColor(QtMaterialStyle::instance().themeColor("border"));
211205
painter.setPen(pen);
212-
painter.drawLine(rect().center()-QPointF(20, 20), rect().center()+QPointF(20, 20));
213-
painter.drawLine(rect().center()+QPointF(20, -20), rect().center()-QPointF(20, -20));
206+
painter.drawLine(rect().center() - QPointF(20, 20), rect().center() + QPointF(20, 20));
207+
painter.drawLine(rect().center() + QPointF(20, -20), rect().center() - QPointF(20, -20));
214208
return;
215209
}
216210

217-
if (Material::IndeterminateProgress == d->progressType)
218-
{
219-
painter.translate(width()/2.0, height()/2.0);
211+
if (Material::IndeterminateProgress == d->progressType) {
212+
painter.translate(width() / 2.0, height() / 2.0);
220213
painter.rotate(d->delegate->angle());
221214
}
222215

@@ -225,26 +218,23 @@ void QtMaterialCircularProgress::paintEvent(QPaintEvent *event)
225218
pen.setWidthF(d->penWidth);
226219
pen.setColor(color());
227220

228-
if (Material::IndeterminateProgress == d->progressType)
229-
{
221+
if (Material::IndeterminateProgress == d->progressType) {
230222
QVector<qreal> pattern;
231-
pattern << d->delegate->dashLength()*d->size/50 << 30.0*d->size/50;
223+
pattern << d->delegate->dashLength() * d->size / 50 << 30.0 * d->size / 50;
232224

233-
pen.setDashOffset(d->delegate->dashOffset()*d->size/50);
225+
pen.setDashOffset(d->delegate->dashOffset() * d->size / 50);
234226
pen.setDashPattern(pattern);
235227

236228
painter.setPen(pen);
237229

238-
painter.drawEllipse(QPoint(0, 0), d->size/2, d->size/2);
239-
}
240-
else
241-
{
230+
painter.drawEllipse(QPoint(0, 0), d->size / 2, d->size / 2);
231+
} else {
242232
painter.setPen(pen);
243233

244-
const qreal x = (width()-d->size)/2.0;
245-
const qreal y = (height()-d->size)/2.0;
234+
const qreal x = (width() - d->size) / 2.0;
235+
const qreal y = (height() - d->size) / 2.0;
246236

247-
const qreal a = 360.0*(value()-minimum())/(maximum()-minimum());
237+
const qreal a = 360.0 * (value() - minimum()) / (maximum() - minimum());
248238

249239
QPainterPath path;
250240
path.arcMoveTo(x, y, d->size, d->size, 0);

components/qtmaterialdialog.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#include <QtWidgets/QStackedLayout>
1212

1313
/*!
14-
* \class QtMaterialDialogPrivate
15-
* \internal
14+
* @class QtMaterialDialogPrivate
15+
* @internal
1616
*/
1717

1818
QtMaterialDialogPrivate::QtMaterialDialogPrivate(QtMaterialDialog *q)
@@ -22,22 +22,26 @@ QtMaterialDialogPrivate::QtMaterialDialogPrivate(QtMaterialDialog *q)
2222

2323
QtMaterialDialogPrivate::~QtMaterialDialogPrivate() {}
2424

25+
// main
2526
void QtMaterialDialogPrivate::init()
2627
{
28+
// get public class
2729
Q_Q(QtMaterialDialog);
2830

2931
dialogWindow = new QtMaterialDialogWindow(q);
3032
proxyStack = new QStackedLayout;
3133
stateMachine = new QStateMachine(q);
3234
proxy = new QtMaterialDialogProxy(dialogWindow, proxyStack, q);
3335

36+
// qvbox
3437
QVBoxLayout *layout = new QVBoxLayout;
3538
q->setLayout(layout);
3639

3740
QWidget *widget = new QWidget;
3841
widget->setLayout(proxyStack);
3942
widget->setMinimumWidth(400);
4043

44+
// shadoweffect
4145
QGraphicsDropShadowEffect *effect = new QGraphicsDropShadowEffect;
4246
effect->setColor(QColor(0, 0, 0, 200));
4347
effect->setBlurRadius(64);
@@ -100,7 +104,7 @@ void QtMaterialDialogPrivate::init()
100104
}
101105

102106
/*!
103-
* \class QtMaterialDialog
107+
* @class QtMaterialDialog
104108
*/
105109

106110
QtMaterialDialog::QtMaterialDialog(QWidget *parent)
@@ -143,6 +147,7 @@ void QtMaterialDialog::hideDialog()
143147
d->proxyStack->setCurrentIndex(1);
144148
}
145149

150+
// just paint shadow
146151
void QtMaterialDialog::paintEvent(QPaintEvent *event)
147152
{
148153
Q_UNUSED(event)

components/qtmaterialdialog_internal.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#include <QtWidgets/QStackedLayout>
77

88
/*!
9-
* \class QtMaterialDialogProxy
10-
* \internal
9+
* @class QtMaterialDialogProxy
10+
* @internal
1111
*/
1212

1313
QtMaterialDialogProxy::QtMaterialDialogProxy(QtMaterialDialogWindow *source,
@@ -80,8 +80,8 @@ void QtMaterialDialogProxy::paintEvent(QPaintEvent *event)
8080
}
8181

8282
/*!
83-
* \class QtMaterialDialogWindow
84-
* \internal
83+
* @class QtMaterialDialogWindow
84+
* @internal
8585
*/
8686

8787
QtMaterialDialogWindow::QtMaterialDialogWindow(QtMaterialDialog *dialog, QWidget *parent)

components/qtmaterialdrawer.cpp

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,25 @@
1111
#include <QtWidgets/QVBoxLayout>
1212

1313
/*!
14-
* \class QtMaterialDrawerPrivate
15-
* \internal
14+
* @class QtMaterialDrawerPrivate
15+
* @internal
1616
*/
1717

1818
/*!
19-
* \internal
19+
* @internal
2020
*/
2121
QtMaterialDrawerPrivate::QtMaterialDrawerPrivate(QtMaterialDrawer *q)
2222
: q_ptr(q)
2323
{
2424
}
2525

2626
/*!
27-
* \internal
27+
* @internal
2828
*/
2929
QtMaterialDrawerPrivate::~QtMaterialDrawerPrivate() {}
3030

3131
/*!
32-
* \internal
32+
* @internal
3333
*/
3434
void QtMaterialDrawerPrivate::init()
3535
{
@@ -57,7 +57,7 @@ void QtMaterialDrawerPrivate::init()
5757
}
5858

5959
/*!
60-
* \class QtMaterialDrawer
60+
* @class QtMaterialDrawer
6161
*/
6262

6363
QtMaterialDrawer::QtMaterialDrawer(QWidget *parent)
@@ -158,9 +158,10 @@ void QtMaterialDrawer::openDrawer()
158158
void QtMaterialDrawer::closeDrawer()
159159
{
160160
Q_D(QtMaterialDrawer);
161-
161+
// emit signal to close
162162
emit d->stateMachine->signalClose();
163163

164+
// reset the attribute
164165
if (d->overlay) {
165166
setAttribute(Qt::WA_TransparentForMouseEvents);
166167
setAttribute(Qt::WA_NoSystemBackground);
@@ -184,6 +185,7 @@ bool QtMaterialDrawer::event(QEvent *event)
184185
return QtMaterialOverlayWidget::event(event);
185186
}
186187

188+
// size
187189
bool QtMaterialDrawer::eventFilter(QObject *obj, QEvent *event)
188190
{
189191
Q_D(QtMaterialDrawer);
@@ -192,7 +194,9 @@ bool QtMaterialDrawer::eventFilter(QObject *obj, QEvent *event)
192194
case QEvent::MouseButtonPress: {
193195
QMouseEvent *mouseEvent;
194196
if ((mouseEvent = static_cast<QMouseEvent *>(event))) {
197+
// check canClose
195198
const bool canClose = d->clickToClose || d->overlay;
199+
// auto close location
196200
if (!d->widget->geometry().contains(mouseEvent->pos()) && canClose) {
197201
closeDrawer();
198202
}
@@ -222,6 +226,7 @@ void QtMaterialDrawer::paintEvent(QPaintEvent *event)
222226
if (!d->overlay || d->stateMachine->isInClosedState()) {
223227
return;
224228
}
229+
// shadow
225230
QPainter painter(this);
226231
painter.setOpacity(d->stateMachine->opacity());
227232
painter.fillRect(rect(), Qt::SolidPattern);

components/qtmaterialdrawer_internal.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#include <QtWidgets/QLayout>
88

99
/*!
10-
* \class QtMaterialDrawerStateMachine
11-
* \internal
10+
* @class QtMaterialDrawerStateMachine
11+
* @internal
1212
*/
1313

1414
QtMaterialDrawerStateMachine::QtMaterialDrawerStateMachine(QtMaterialDrawerWidget *drawer, QtMaterialDrawer *parent)

0 commit comments

Comments
 (0)