168492376
/
qt-material-widgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit

This commit is contained in:
ShootingStarDragons 2022-07-15 14:53:46 +08:00
parent e0adf42ff1
commit ff770edc61
23 changed files with 157 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/materiallib/qtmaterialcheckable.cpp
View File

@ -15,8 +15,8 @@
#include <QStateMachine> #include <QStateMachine>
/*! /*!
* \class QtMaterialCheckablePrivate * @class QtMaterialCheckablePrivate
* \internal * @internal
*/ */
QtMaterialCheckablePrivate::QtMaterialCheckablePrivate(QtMaterialCheckable *q) QtMaterialCheckablePrivate::QtMaterialCheckablePrivate(QtMaterialCheckable *q)
@ -123,7 +123,7 @@ void QtMaterialCheckablePrivate::init()
} }
/*! /*!
* \class QtMaterialCheckable * @class QtMaterialCheckable
*/ */
QtMaterialCheckable::QtMaterialCheckable(QWidget *parent) QtMaterialCheckable::QtMaterialCheckable(QWidget *parent)
@ -284,7 +284,7 @@ QIcon QtMaterialCheckable::uncheckedIcon() const
} }
/*! /*!
* \reimp * @reimp
*/ */
QSize QtMaterialCheckable::sizeHint() const QSize QtMaterialCheckable::sizeHint() const
{ {
@ -302,7 +302,7 @@ QtMaterialCheckable::QtMaterialCheckable(QtMaterialCheckablePrivate &d, QWidget
} }
/*! /*!
* \reimp * @reimp
*/ */
bool QtMaterialCheckable::event(QEvent *event) bool QtMaterialCheckable::event(QEvent *event)
{ {
@ -328,7 +328,7 @@ bool QtMaterialCheckable::event(QEvent *event)
} }
/*! /*!
* \reimp * @reimp
*/ */
bool QtMaterialCheckable::eventFilter(QObject *obj, QEvent *event) bool QtMaterialCheckable::eventFilter(QObject *obj, QEvent *event)
{ {
@ -341,7 +341,7 @@ bool QtMaterialCheckable::eventFilter(QObject *obj, QEvent *event)
} }
/*! /*!
* \reimp * @reimp
*/ */
void QtMaterialCheckable::mousePressEvent(QMouseEvent *event) void QtMaterialCheckable::mousePressEvent(QMouseEvent *event)
{ {
@ -370,7 +370,7 @@ void QtMaterialCheckable::mousePressEvent(QMouseEvent *event)
} }
/*! /*!
* \reimp * @reimp
*/ */
void QtMaterialCheckable::paintEvent(QPaintEvent *event) void QtMaterialCheckable::paintEvent(QPaintEvent *event)
{ {

4
components/materiallib/qtmaterialcheckable_internal.cpp
View File

@ -6,8 +6,8 @@
#include <QTransform> #include <QTransform>
/*! /*!
* \class QtMaterialCheckableIcon * @class QtMaterialCheckableIcon
* \internal * @internal
*/ */
QtMaterialCheckableIcon::QtMaterialCheckableIcon(const QIcon &icon, QtMaterialCheckable *parent) QtMaterialCheckableIcon::QtMaterialCheckableIcon(const QIcon &icon, QtMaterialCheckable *parent)

4
components/materiallib/qtmaterialripple.cpp
View File

@ -2,8 +2,8 @@
#include <lib/qtmaterialrippleoverlay.h> #include <lib/qtmaterialrippleoverlay.h>
/*! /*!
* \class QtMaterialRipple * @class QtMaterialRipple
* \internal * @internal
*/ */
QtMaterialRipple::QtMaterialRipple(const QPoint &center, QObject *parent) QtMaterialRipple::QtMaterialRipple(const QPoint &center, QObject *parent)

6
components/materiallib/qtmaterialrippleoverlay.cpp
View File

@ -3,8 +3,8 @@
#include <QPainter> #include <QPainter>
/*! /*!
* \class QtMaterialRippleOverlay * @class QtMaterialRippleOverlay
* \internal * @internal
*/ */
QtMaterialRippleOverlay::QtMaterialRippleOverlay(QWidget *parent) QtMaterialRippleOverlay::QtMaterialRippleOverlay(QWidget *parent)
@ -43,7 +43,7 @@ void QtMaterialRippleOverlay::removeRipple(QtMaterialRipple *ripple)
} }
/*! /*!
* \reimp * @reimp
*/ */
void QtMaterialRippleOverlay::paintEvent(QPaintEvent *event) void QtMaterialRippleOverlay::paintEvent(QPaintEvent *event)
{ {

10
components/materiallib/qtmaterialstyle.cpp
View File

@ -1,10 +1,10 @@
#include <QFontDatabase>
#include <lib/qtmaterialstyle.h> #include <lib/qtmaterialstyle.h>
#include <lib/qtmaterialtheme.h> #include <lib/qtmaterialtheme.h>
#include <QFontDatabase>
/*! /*!
* \class QtMaterialStylePrivate * @class QtMaterialStylePrivate
* \internal * @internal
*/ */
QtMaterialStylePrivate::QtMaterialStylePrivate(QtMaterialStyle *q) QtMaterialStylePrivate::QtMaterialStylePrivate(QtMaterialStyle *q)
@ -26,8 +26,8 @@ void QtMaterialStylePrivate::init()
} }
/*! /*!
* \class QtMaterialStyle * @class QtMaterialStyle
* \internal * @internal
*/ */
void QtMaterialStyle::setTheme(QtMaterialTheme *theme) void QtMaterialStyle::setTheme(QtMaterialTheme *theme)

6
components/materiallib/qtmaterialtheme.cpp
View File

@ -7,8 +7,8 @@
#include <QStringBuilder> #include <QStringBuilder>
/*!material /*!material
* \class QtMaterialThemePrivate * @class QtMaterialThemePrivate
* \internal * @internal
*/ */
QtMaterialThemePrivate::QtMaterialThemePrivate(QtMaterialTheme *q) QtMaterialThemePrivate::QtMaterialThemePrivate(QtMaterialTheme *q)
@ -26,7 +26,7 @@ QColor QtMaterialThemePrivate::rgba(int r, int g, int b, qreal a) const
} }
/*! /*!
* \class QtMaterialTheme * @class QtMaterialTheme
*/ */
QtMaterialTheme::QtMaterialTheme(QObject *parent) QtMaterialTheme::QtMaterialTheme(QObject *parent)

12
components/qtmaterialappbar.cpp
View File

@ -5,12 +5,12 @@
#include <QtWidgets/QGraphicsDropShadowEffect> #include <QtWidgets/QGraphicsDropShadowEffect>
/*! /*!
* \class QtMaterialAppBarPrivate * @class QtMaterialAppBarPrivate
* \internal * @internal
*/ */
/*! /*!
* \internal * @internal
*/ */
QtMaterialAppBarPrivate::QtMaterialAppBarPrivate(QtMaterialAppBar *q) QtMaterialAppBarPrivate::QtMaterialAppBarPrivate(QtMaterialAppBar *q)
: q_ptr(q) : q_ptr(q)
@ -18,12 +18,12 @@ QtMaterialAppBarPrivate::QtMaterialAppBarPrivate(QtMaterialAppBar *q)
} }
/*! /*!
* \internal * @internal
*/ */
QtMaterialAppBarPrivate::~QtMaterialAppBarPrivate() {} QtMaterialAppBarPrivate::~QtMaterialAppBarPrivate() {}
/*! /*!
* \internal * @internal
*/ */
void QtMaterialAppBarPrivate::init() void QtMaterialAppBarPrivate::init()
{ {
@ -43,7 +43,7 @@ void QtMaterialAppBarPrivate::init()
} }
/*! /*!
* \class QtMaterialAppBar * @class QtMaterialAppBar
*/ */
QtMaterialAppBar::QtMaterialAppBar(QWidget *parent) QtMaterialAppBar::QtMaterialAppBar(QWidget *parent)

8
components/qtmaterialautocomplete_internal.cpp
View File

@ -5,12 +5,12 @@
#include <QtWidgets/QGraphicsOpacityEffect> #include <QtWidgets/QGraphicsOpacityEffect>
/*! /*!
* \class QtMaterialAutoCompleteStateMachine * @class QtMaterialAutoCompleteStateMachine
* \internal * @internal
*/ */
/*! /*!
* \internal * @internal
*/ */
QtMaterialAutoCompleteStateMachine::QtMaterialAutoCompleteStateMachine(QWidget *menu) QtMaterialAutoCompleteStateMachine::QtMaterialAutoCompleteStateMachine(QWidget *menu)
: QStateMachine(menu) : QStateMachine(menu)
@ -62,6 +62,6 @@ QtMaterialAutoCompleteStateMachine::QtMaterialAutoCompleteStateMachine(QWidget *
} }
/*! /*!
* \internal * @internal
*/ */
QtMaterialAutoCompleteStateMachine::~QtMaterialAutoCompleteStateMachine() {} QtMaterialAutoCompleteStateMachine::~QtMaterialAutoCompleteStateMachine() {}

132
components/qtmaterialavatar.cpp
View File

@ -1,16 +1,16 @@
#include "qtmaterialavatar.h" #include "qtmaterialavatar.h"
#include "lib/qtmaterialstyle.h"
#include "qtmaterialavatar_p.h" #include "qtmaterialavatar_p.h"
#include <QPainter> #include <QPainter>
#include <QPainterPath> #include <QPainterPath>
#include "lib/qtmaterialstyle.h"
/*! /*!
* \class QtMaterialAvatarPrivate * @class QtMaterialAvatarPrivate
* \internal * @internal
*/ */
/*! /*!
* \internal * @internal
*/ */
QtMaterialAvatarPrivate::QtMaterialAvatarPrivate(QtMaterialAvatar *q) QtMaterialAvatarPrivate::QtMaterialAvatarPrivate(QtMaterialAvatar *q)
: q_ptr(q) : q_ptr(q)
@ -18,46 +18,43 @@ QtMaterialAvatarPrivate::QtMaterialAvatarPrivate(QtMaterialAvatar *q)
} }
/*! /*!
* \internal * @internal
*/ */
QtMaterialAvatarPrivate::~QtMaterialAvatarPrivate() QtMaterialAvatarPrivate::~QtMaterialAvatarPrivate() {}
{
}
/*! /*!
* \internal * @internal
*/ */
void QtMaterialAvatarPrivate::init() void QtMaterialAvatarPrivate::init()
{ {
Q_Q(QtMaterialAvatar); Q_Q(QtMaterialAvatar);
size = 40; size = 40;
type = Material::LetterAvatar; type = Material::LetterAvatar;
useThemeColors = true; useThemeColors = true;
QFont font(q->font()); QFont font(q->font());
font.setPointSizeF(16); font.setPointSizeF(16);
q->setFont(font); q->setFont(font);
QSizePolicy policy(QSizePolicy::MinimumExpanding, QSizePolicy policy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
QSizePolicy::MinimumExpanding);
q->setSizePolicy(policy); q->setSizePolicy(policy);
} }
/*! /*!
* \class QtMaterialAvatar * @class QtMaterialAvatar
*/ */
QtMaterialAvatar::QtMaterialAvatar(QWidget *parent) QtMaterialAvatar::QtMaterialAvatar(QWidget *parent)
: QWidget(parent), : QWidget(parent)
d_ptr(new QtMaterialAvatarPrivate(this)) , d_ptr(new QtMaterialAvatarPrivate(this))
{ {
d_func()->init(); d_func()->init();
} }
QtMaterialAvatar::QtMaterialAvatar(const QIcon &icon, QWidget *parent) QtMaterialAvatar::QtMaterialAvatar(const QIcon &icon, QWidget *parent)
: QWidget(parent), : QWidget(parent)
d_ptr(new QtMaterialAvatarPrivate(this)) , d_ptr(new QtMaterialAvatarPrivate(this))
{ {
d_func()->init(); d_func()->init();
@ -65,8 +62,8 @@ QtMaterialAvatar::QtMaterialAvatar(const QIcon &icon, QWidget *parent)
} }
QtMaterialAvatar::QtMaterialAvatar(const QChar &letter, QWidget *parent) QtMaterialAvatar::QtMaterialAvatar(const QChar &letter, QWidget *parent)
: QWidget(parent), : QWidget(parent)
d_ptr(new QtMaterialAvatarPrivate(this)) , d_ptr(new QtMaterialAvatarPrivate(this))
{ {
d_func()->init(); d_func()->init();
@ -74,17 +71,15 @@ QtMaterialAvatar::QtMaterialAvatar(const QChar &letter, QWidget *parent)
} }
QtMaterialAvatar::QtMaterialAvatar(const QImage &image, QWidget *parent) QtMaterialAvatar::QtMaterialAvatar(const QImage &image, QWidget *parent)
: QWidget(parent), : QWidget(parent)
d_ptr(new QtMaterialAvatarPrivate(this)) , d_ptr(new QtMaterialAvatarPrivate(this))
{ {
d_func()->init(); d_func()->init();
setImage(image); setImage(image);
} }
QtMaterialAvatar::~QtMaterialAvatar() QtMaterialAvatar::~QtMaterialAvatar() {}
{
}
void QtMaterialAvatar::setUseThemeColors(bool value) void QtMaterialAvatar::setUseThemeColors(bool value)
{ {
@ -131,7 +126,7 @@ void QtMaterialAvatar::setBackgroundColor(const QColor &color)
Q_D(QtMaterialAvatar); Q_D(QtMaterialAvatar);
d->backgroundColor = color; d->backgroundColor = color;
MATERIAL_DISABLE_THEME_COLORS MATERIAL_DISABLE_THEME_COLORS
update(); update();
} }
@ -148,13 +143,13 @@ QColor QtMaterialAvatar::backgroundColor() const
} }
/*! /*!
* \reimp * @reimp
*/ */
QSize QtMaterialAvatar::sizeHint() const QSize QtMaterialAvatar::sizeHint() const
{ {
Q_D(const QtMaterialAvatar); Q_D(const QtMaterialAvatar);
return QSize(d->size+2, d->size+2); return QSize(d->size + 2, d->size + 2);
} }
void QtMaterialAvatar::setSize(int size) void QtMaterialAvatar::setSize(int size)
@ -164,13 +159,11 @@ void QtMaterialAvatar::setSize(int size)
d->size = size; d->size = size;
if (!d->image.isNull()) { if (!d->image.isNull()) {
d->pixmap = QPixmap::fromImage(d->image.scaled(d->size, d->size, d->pixmap = QPixmap::fromImage(d->image.scaled(d->size, d->size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
Qt::IgnoreAspectRatio,
Qt::SmoothTransformation));
} }
QFont f(font()); QFont f(font());
f.setPointSizeF(size*16.0/40.0); f.setPointSizeF(size * 16.0 / 40.0);
setFont(f); setFont(f);
update(); update();
@ -199,9 +192,7 @@ void QtMaterialAvatar::setImage(const QImage &image)
d->image = image; d->image = image;
d->type = Material::ImageAvatar; d->type = Material::ImageAvatar;
d->pixmap = QPixmap::fromImage(image.scaled(d->size, d->size, d->pixmap = QPixmap::fromImage(image.scaled(d->size, d->size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
Qt::IgnoreAspectRatio,
Qt::SmoothTransformation));
update(); update();
} }
@ -222,7 +213,7 @@ Material::AvatarType QtMaterialAvatar::type() const
} }
/*! /*!
* \reimp * @reimp
*/ */
void QtMaterialAvatar::paintEvent(QPaintEvent *event) void QtMaterialAvatar::paintEvent(QPaintEvent *event)
{ {
@ -234,61 +225,52 @@ void QtMaterialAvatar::paintEvent(QPaintEvent *event)
painter.setRenderHint(QPainter::Antialiasing); painter.setRenderHint(QPainter::Antialiasing);
QRect r = rect(); QRect r = rect();
const qreal hs = d->size/2.0; const qreal hs = d->size / 2.0;
if (!isEnabled()) if (!isEnabled()) {
{
QBrush brush; QBrush brush;
brush.setStyle(Qt::SolidPattern); brush.setStyle(Qt::SolidPattern);
brush.setColor(QtMaterialStyle::instance().themeColor("disabled")); brush.setColor(QtMaterialStyle::instance().themeColor("disabled"));
painter.setPen(Qt::NoPen); painter.setPen(Qt::NoPen);
painter.setBrush(brush); painter.setBrush(brush);
painter.drawEllipse(QRectF((width()-d->size)/2.0, (height()-d->size)/2.0, painter.drawEllipse(QRectF((width() - d->size) / 2.0, (height() - d->size) / 2.0, d->size, d->size));
d->size, d->size));
return; return;
} }
if (Material::ImageAvatar != d->type) if (Material::ImageAvatar != d->type) {
{
QBrush brush; QBrush brush;
brush.setStyle(Qt::SolidPattern); brush.setStyle(Qt::SolidPattern);
brush.setColor(backgroundColor()); brush.setColor(backgroundColor());
painter.setPen(Qt::NoPen); painter.setPen(Qt::NoPen);
painter.setBrush(brush); painter.setBrush(brush);
painter.drawEllipse(QRectF((width()-d->size)/2.0, (height()-d->size)/2.0, painter.drawEllipse(QRectF((width() - d->size) / 2.0, (height() - d->size) / 2.0, d->size, d->size));
d->size, d->size));
} }
switch (d->type) switch (d->type) {
{ case Material::ImageAvatar: {
case Material::ImageAvatar: QPainterPath path;
{ path.addEllipse(width() / 2.0 - hs, height() / 2.0 - hs, d->size, d->size);
QPainterPath path; painter.setClipPath(path);
path.addEllipse(width()/2.0-hs, height()/2.0-hs, d->size, d->size);
painter.setClipPath(path);
painter.drawPixmap(QRect(width()/2.0-hs, height()/2.0-hs, d->size, d->size), painter.drawPixmap(QRect(width() / 2.0 - hs, height() / 2.0 - hs, d->size, d->size), d->pixmap);
d->pixmap); break;
break; }
} case Material::IconAvatar: {
case Material::IconAvatar: QRect iconGeometry((width() - hs) / 2, (height() - hs) / 2, hs, hs);
{ QPixmap pixmap = d->icon.pixmap(hs, hs);
QRect iconGeometry((width()-hs)/2, (height()-hs)/2, hs, hs); QPainter icon(&pixmap);
QPixmap pixmap = d->icon.pixmap(hs, hs); icon.setCompositionMode(QPainter::CompositionMode_SourceIn);
QPainter icon(&pixmap); icon.fillRect(pixmap.rect(), textColor());
icon.setCompositionMode(QPainter::CompositionMode_SourceIn); painter.drawPixmap(iconGeometry, pixmap);
icon.fillRect(pixmap.rect(), textColor()); break;
painter.drawPixmap(iconGeometry, pixmap); }
break; case Material::LetterAvatar: {
} painter.setPen(textColor());
case Material::LetterAvatar: painter.setBrush(Qt::NoBrush);
{ painter.drawText(r, Qt::AlignCenter, QString(d->letter));
painter.setPen(textColor()); break;
painter.setBrush(Qt::NoBrush); }
painter.drawText(r, Qt::AlignCenter, QString(d->letter)); default:
break; break;
}
default:
break;
} }
} }

10
components/qtmaterialbadge.cpp
View File

@ -4,12 +4,12 @@
#include <QPainter> #include <QPainter>
/*! /*!
* \class QtMaterialBadgePrivate * @class QtMaterialBadgePrivate
* \internal * @internal
*/ */
/*! /*!
* \internal * @internal
*/ */
QtMaterialBadgePrivate::QtMaterialBadgePrivate(QtMaterialBadge *q) QtMaterialBadgePrivate::QtMaterialBadgePrivate(QtMaterialBadge *q)
: q_ptr(q) : q_ptr(q)
@ -17,12 +17,12 @@ QtMaterialBadgePrivate::QtMaterialBadgePrivate(QtMaterialBadge *q)
} }
/*! /*!
* \internal * @internal
*/ */
QtMaterialBadgePrivate::~QtMaterialBadgePrivate() {} QtMaterialBadgePrivate::~QtMaterialBadgePrivate() {}
/*! /*!
* \internal * @internal
*/ */
void QtMaterialBadgePrivate::init() void QtMaterialBadgePrivate::init()
{ {

12
components/qtmaterialcheckbox.cpp
View File

@ -6,12 +6,12 @@
#include <QState> #include <QState>
/*! /*!
* \class QtMaterialCheckBoxPrivate * @class QtMaterialCheckBoxPrivate
* \internal * @internal
*/ */
/*! /*!
* \internal * @internal
*/ */
QtMaterialCheckBoxPrivate::QtMaterialCheckBoxPrivate(QtMaterialCheckBox *q) QtMaterialCheckBoxPrivate::QtMaterialCheckBoxPrivate(QtMaterialCheckBox *q)
: QtMaterialCheckablePrivate(q) : QtMaterialCheckablePrivate(q)
@ -20,12 +20,12 @@ QtMaterialCheckBoxPrivate::QtMaterialCheckBoxPrivate(QtMaterialCheckBox *q)
} }
/*! /*!
* \internal * @internal
*/ */
QtMaterialCheckBoxPrivate::~QtMaterialCheckBoxPrivate() {} QtMaterialCheckBoxPrivate::~QtMaterialCheckBoxPrivate() {}
/*! /*!
* \internal * @internal
*/ */
void QtMaterialCheckBoxPrivate::init() void QtMaterialCheckBoxPrivate::init()
{ {
@ -70,7 +70,7 @@ void QtMaterialCheckBoxPrivate::init()
} }
/*! /*!
* \class QtMaterialCheckBox * @class QtMaterialCheckBox
*/ */
QtMaterialCheckBox::QtMaterialCheckBox(QWidget *parent) QtMaterialCheckBox::QtMaterialCheckBox(QWidget *parent)

6
components/qtmaterialcircularprogress.cpp
View File

@ -75,7 +75,7 @@ void QtMaterialCircularProgressPrivate::init()
} }
/*! /*!
* \class QtMaterialCircularProgress * @class QtMaterialCircularProgress
*/ */
QtMaterialCircularProgress::QtMaterialCircularProgress(QWidget *parent) QtMaterialCircularProgress::QtMaterialCircularProgress(QWidget *parent)
@ -175,7 +175,7 @@ QColor QtMaterialCircularProgress::color() const
} }
/*! /*!
* \reimp * @reimp
*/ */
QSize QtMaterialCircularProgress::sizeHint() const QSize QtMaterialCircularProgress::sizeHint() const
{ {
@ -186,7 +186,7 @@ QSize QtMaterialCircularProgress::sizeHint() const
} }
/*! /*!
* \reimp * @reimp
*/ */
void QtMaterialCircularProgress::paintEvent(QPaintEvent *event) void QtMaterialCircularProgress::paintEvent(QPaintEvent *event)
{ {

4
components/qtmaterialcircularprogress_internal.cpp
View File

@ -1,8 +1,8 @@
#include "qtmaterialcircularprogress_internal.h" #include "qtmaterialcircularprogress_internal.h"
/*! /*!
* \class QtMaterialCircularProgressDelegate * @class QtMaterialCircularProgressDelegate
* \internal * @internal
*/ */
QtMaterialCircularProgressDelegate::QtMaterialCircularProgressDelegate(QtMaterialCircularProgress *parent) QtMaterialCircularProgressDelegate::QtMaterialCircularProgressDelegate(QtMaterialCircularProgress *parent)

4
components/qtmaterialdrawer_internal.cpp
View File

@ -113,8 +113,8 @@ void QtMaterialDrawerStateMachine::updatePropertyAssignments()
} }
/*! /*!
* \class QtMaterialDrawerWidget * @class QtMaterialDrawerWidget
* \internal * @internal
*/ */
QtMaterialDrawerWidget::QtMaterialDrawerWidget(QWidget *parent) QtMaterialDrawerWidget::QtMaterialDrawerWidget(QWidget *parent)

30
components/qtmaterialflatbutton.cpp
View File

@ -12,12 +12,12 @@
#include <QResizeEvent> #include <QResizeEvent>
/*! /*!
* \class QtMaterialFlatButtonPrivate * @class QtMaterialFlatButtonPrivate
* \internal * @internal
*/ */
/*! /*!
* \internal * @internal
*/ */
QtMaterialFlatButtonPrivate::QtMaterialFlatButtonPrivate(QtMaterialFlatButton *q) QtMaterialFlatButtonPrivate::QtMaterialFlatButtonPrivate(QtMaterialFlatButton *q)
: q_ptr(q) : q_ptr(q)
@ -25,12 +25,12 @@ QtMaterialFlatButtonPrivate::QtMaterialFlatButtonPrivate(QtMaterialFlatButton *q
} }
/*! /*!
* \internal * @internal
*/ */
QtMaterialFlatButtonPrivate::~QtMaterialFlatButtonPrivate() {} QtMaterialFlatButtonPrivate::~QtMaterialFlatButtonPrivate() {}
/*! /*!
* \internal * @internal
*/ */
void QtMaterialFlatButtonPrivate::init() void QtMaterialFlatButtonPrivate::init()
{ {
@ -70,7 +70,7 @@ void QtMaterialFlatButtonPrivate::init()
} }
/*! /*!
* \class QtMaterialFlatButton * @class QtMaterialFlatButton
*/ */
QtMaterialFlatButton::QtMaterialFlatButton(QWidget *parent, Material::ButtonPreset preset) QtMaterialFlatButton::QtMaterialFlatButton(QWidget *parent, Material::ButtonPreset preset)
@ -450,7 +450,7 @@ Qt::Alignment QtMaterialFlatButton::textAlignment() const
} }
/*! /*!
* \reimp * @reimp
*/ */
QSize QtMaterialFlatButton::sizeHint() const QSize QtMaterialFlatButton::sizeHint() const
{ {
@ -477,7 +477,7 @@ QtMaterialFlatButton::QtMaterialFlatButton(QtMaterialFlatButtonPrivate &d, QWidg
} }
/*! /*!
* \reimp * @reimp
*/ */
void QtMaterialFlatButton::checkStateSet() void QtMaterialFlatButton::checkStateSet()
{ {
@ -489,7 +489,7 @@ void QtMaterialFlatButton::checkStateSet()
} }
/*! /*!
* \reimp * @reimp
*/ */
void QtMaterialFlatButton::mousePressEvent(QMouseEvent *event) void QtMaterialFlatButton::mousePressEvent(QMouseEvent *event)
{ {
@ -526,7 +526,7 @@ void QtMaterialFlatButton::mousePressEvent(QMouseEvent *event)
} }
/*! /*!
* \reimp * @reimp
*/ */
void QtMaterialFlatButton::mouseReleaseEvent(QMouseEvent *event) void QtMaterialFlatButton::mouseReleaseEvent(QMouseEvent *event)
{ {
@ -545,7 +545,7 @@ void QtMaterialFlatButton::resizeEvent(QResizeEvent *event)
} }
/*! /*!
* \reimp * @reimp
*/ */
void QtMaterialFlatButton::paintEvent(QPaintEvent *event) void QtMaterialFlatButton::paintEvent(QPaintEvent *event)
{ {
@ -576,7 +576,7 @@ void QtMaterialFlatButton::paintEvent(QPaintEvent *event)
} }
/*! /*!
* \internal * @internal
*/ */
void QtMaterialFlatButton::paintBackground(QPainter *painter) void QtMaterialFlatButton::paintBackground(QPainter *painter)
{ {
@ -630,7 +630,7 @@ void QtMaterialFlatButton::paintBackground(QPainter *painter)
} }
/*! /*!
* \internal * @internal
*/ */
void QtMaterialFlatButton::paintHalo(QPainter *painter) void QtMaterialFlatButton::paintHalo(QPainter *painter)
{ {
@ -659,7 +659,7 @@ void QtMaterialFlatButton::paintHalo(QPainter *painter)
#define COLOR_INTERPOLATE(CH) (1 - progress) * source.CH() + progress *dest.CH() #define COLOR_INTERPOLATE(CH) (1 - progress) * source.CH() + progress *dest.CH()
/*! /*!
* \internal * @internal
*/ */
void QtMaterialFlatButton::paintForeground(QPainter *painter) void QtMaterialFlatButton::paintForeground(QPainter *painter)
{ {
@ -716,7 +716,7 @@ void QtMaterialFlatButton::paintForeground(QPainter *painter)
} }
/*! /*!
* \internal * @internal
*/ */
void QtMaterialFlatButton::updateClipPath() void QtMaterialFlatButton::updateClipPath()
{ {

4
components/qtmaterialflatbutton_internal.cpp
View File

@ -7,8 +7,8 @@
#include <QSequentialAnimationGroup> #include <QSequentialAnimationGroup>
/*! /*!
* \class QtMaterialFlatButtonStateMachine * @class QtMaterialFlatButtonStateMachine
* \internal * @internal
*/ */
QtMaterialFlatButtonStateMachine::QtMaterialFlatButtonStateMachine(QtMaterialFlatButton *parent) QtMaterialFlatButtonStateMachine::QtMaterialFlatButtonStateMachine(QtMaterialFlatButton *parent)

16
components/qtmaterialiconbutton.cpp
View File

@ -6,8 +6,8 @@
#include <QPainter> #include <QPainter>
/*! /*!
* \class QtMaterialIconButtonPrivate * @class QtMaterialIconButtonPrivate
* \internal * @internal
*/ */
QtMaterialIconButtonPrivate::QtMaterialIconButtonPrivate(QtMaterialIconButton *q) QtMaterialIconButtonPrivate::QtMaterialIconButtonPrivate(QtMaterialIconButton *q)
@ -44,7 +44,7 @@ void QtMaterialIconButtonPrivate::updateRipple()
} }
/*! /*!
* \class QtMaterialIconButton * @class QtMaterialIconButton
*/ */
QtMaterialIconButton::QtMaterialIconButton(const QIcon &icon, QWidget *parent) QtMaterialIconButton::QtMaterialIconButton(const QIcon &icon, QWidget *parent)
@ -59,7 +59,7 @@ QtMaterialIconButton::QtMaterialIconButton(const QIcon &icon, QWidget *parent)
QtMaterialIconButton::~QtMaterialIconButton() {} QtMaterialIconButton::~QtMaterialIconButton() {}
/*! /*!
* \reimp * @reimp
*/ */
QSize QtMaterialIconButton::sizeHint() const QSize QtMaterialIconButton::sizeHint() const
{ {
@ -133,7 +133,7 @@ QtMaterialIconButton::QtMaterialIconButton(QtMaterialIconButtonPrivate &d, QWidg
} }
/*! /*!
* \reimp * @reimp
*/ */
bool QtMaterialIconButton::event(QEvent *event) bool QtMaterialIconButton::event(QEvent *event)
{ {
@ -158,7 +158,7 @@ bool QtMaterialIconButton::event(QEvent *event)
} }
/*! /*!
* \reimp * @reimp
*/ */
bool QtMaterialIconButton::eventFilter(QObject *obj, QEvent *event) bool QtMaterialIconButton::eventFilter(QObject *obj, QEvent *event)
{ {
@ -171,7 +171,7 @@ bool QtMaterialIconButton::eventFilter(QObject *obj, QEvent *event)
} }
/*! /*!
* \reimp * @reimp
*/ */
void QtMaterialIconButton::mousePressEvent(QMouseEvent *event) void QtMaterialIconButton::mousePressEvent(QMouseEvent *event)
{ {
@ -184,7 +184,7 @@ void QtMaterialIconButton::mousePressEvent(QMouseEvent *event)
} }
/*! /*!
* \reimp * @reimp
*/ */
void QtMaterialIconButton::paintEvent(QPaintEvent *event) void QtMaterialIconButton::paintEvent(QPaintEvent *event)
{ {

8
components/qtmaterialprogress.cpp
View File

@ -7,8 +7,8 @@
#include <QPropertyAnimation> #include <QPropertyAnimation>
/*! /*!
* \class QtMaterialProgressPrivate * @class QtMaterialProgressPrivate
* \internal * @internal
*/ */
QtMaterialProgressPrivate::QtMaterialProgressPrivate(QtMaterialProgress *q) QtMaterialProgressPrivate::QtMaterialProgressPrivate(QtMaterialProgress *q)
@ -41,7 +41,7 @@ void QtMaterialProgressPrivate::init()
} }
/*! /*!
* \class QtMaterialProgress * @class QtMaterialProgress
*/ */
QtMaterialProgress::QtMaterialProgress(QWidget *parent) QtMaterialProgress::QtMaterialProgress(QWidget *parent)
@ -130,7 +130,7 @@ QColor QtMaterialProgress::backgroundColor() const
} }
/*! /*!
* \reimp * @reimp
*/ */
void QtMaterialProgress::paintEvent(QPaintEvent *event) void QtMaterialProgress::paintEvent(QPaintEvent *event)
{ {

4
components/qtmaterialprogress_internal.cpp
View File

@ -1,8 +1,8 @@
#include "qtmaterialprogress_internal.h" #include "qtmaterialprogress_internal.h"
/*! /*!
* \class QtMaterialProgressDelegate * @class QtMaterialProgressDelegate
* \internal * @internal
*/ */
QtMaterialProgressDelegate::QtMaterialProgressDelegate(QtMaterialProgress *parent) QtMaterialProgressDelegate::QtMaterialProgressDelegate(QtMaterialProgress *parent)

10
components/qtmaterialscrollbar_internal.h
View File

@ -1,8 +1,8 @@
#ifndef QTMATERIALSCROLLBAR_INTERNAL_H #ifndef QTMATERIALSCROLLBAR_INTERNAL_H
#define QTMATERIALSCROLLBAR_INTERNAL_H #define QTMATERIALSCROLLBAR_INTERNAL_H
#include <QStateMachine>
#include "qtmaterialscrollbar.h" #include "qtmaterialscrollbar.h"
#include <QStateMachine>
class QtMaterialScrollBarStateMachine : public QStateMachine class QtMaterialScrollBarStateMachine : public QStateMachine
{ {
@ -21,9 +21,9 @@ private:
Q_DISABLE_COPY(QtMaterialScrollBarStateMachine) Q_DISABLE_COPY(QtMaterialScrollBarStateMachine)
QtMaterialScrollBar *const m_scrollBar; QtMaterialScrollBar *const m_scrollBar;
QState *const m_focusState; QState *const m_focusState;
QState *const m_blurState; QState *const m_blurState;
qreal m_opacity; qreal m_opacity;
}; };
inline void QtMaterialScrollBarStateMachine::setOpacity(qreal opacity) inline void QtMaterialScrollBarStateMachine::setOpacity(qreal opacity)
@ -37,4 +37,4 @@ inline qreal QtMaterialScrollBarStateMachine::opacity() const
return m_opacity; return m_opacity;
} }
#endif // QTMATERIALSCROLLBAR_INTERNAL_H #endif // QTMATERIALSCROLLBAR_INTERNAL_H

8
components/qtmaterialtabs_internal.cpp
View File

@ -8,8 +8,8 @@
#include <QtWidgets/QLayoutItem> #include <QtWidgets/QLayoutItem>
/*! /*!
* \class QtMaterialTabsInkBar * @class QtMaterialTabsInkBar
* \internal * @internal
*/ */
QtMaterialTabsInkBar::QtMaterialTabsInkBar(QtMaterialTabs *parent) QtMaterialTabsInkBar::QtMaterialTabsInkBar(QtMaterialTabs *parent)
@ -89,8 +89,8 @@ void QtMaterialTabsInkBar::paintEvent(QPaintEvent *event)
} }
/*! /*!
* \class QtMaterialTab * @class QtMaterialTab
* \internal * @internal
*/ */
QtMaterialTab::QtMaterialTab(QtMaterialTabs *parent) QtMaterialTab::QtMaterialTab(QtMaterialTabs *parent)

8
components/qtmaterialtextfield.cpp
View File

@ -7,8 +7,8 @@
#include <QtWidgets/QApplication> #include <QtWidgets/QApplication>
/*! /*!
* \class QtMaterialTextFieldPrivate * @class QtMaterialTextFieldPrivate
* \internal * @internal
*/ */
QtMaterialTextFieldPrivate::QtMaterialTextFieldPrivate(QtMaterialTextField *q) QtMaterialTextFieldPrivate::QtMaterialTextFieldPrivate(QtMaterialTextField *q)
@ -42,7 +42,7 @@ void QtMaterialTextFieldPrivate::init()
} }
/*! /*!
* \class QtMaterialTextField * @class QtMaterialTextField
*/ */
QtMaterialTextField::QtMaterialTextField(QWidget *parent) QtMaterialTextField::QtMaterialTextField(QWidget *parent)
@ -251,7 +251,7 @@ QtMaterialTextField::QtMaterialTextField(QtMaterialTextFieldPrivate &d, QWidget
} }
/*! /*!
* \reimp * @reimp
*/ */
bool QtMaterialTextField::event(QEvent *event) bool QtMaterialTextField::event(QEvent *event)
{ {

10
components/qtmaterialtextfield_internal.cpp
View File

@ -5,8 +5,8 @@
#include <QPropertyAnimation> #include <QPropertyAnimation>
/*! /*!
* \class QtMaterialTextFieldStateMachine * @class QtMaterialTextFieldStateMachine
* \internal * @internal
*/ */
QtMaterialTextFieldStateMachine::QtMaterialTextFieldStateMachine(QtMaterialTextField *parent) QtMaterialTextFieldStateMachine::QtMaterialTextFieldStateMachine(QtMaterialTextField *parent)
@ -115,8 +115,8 @@ void QtMaterialTextFieldStateMachine::setupProperties()
} }
/*! /*!
* \class QtMaterialTextFieldLabel * @class QtMaterialTextFieldLabel
* \internal * @internal
*/ */
QtMaterialTextFieldLabel::QtMaterialTextFieldLabel(QtMaterialTextField *parent) QtMaterialTextFieldLabel::QtMaterialTextFieldLabel(QtMaterialTextField *parent)
@ -137,7 +137,7 @@ QtMaterialTextFieldLabel::QtMaterialTextFieldLabel(QtMaterialTextField *parent)
QtMaterialTextFieldLabel::~QtMaterialTextFieldLabel() {} QtMaterialTextFieldLabel::~QtMaterialTextFieldLabel() {}
/*! /*!
* \reimp * @reimp
*/ */
void QtMaterialTextFieldLabel::paintEvent(QPaintEvent *event) void QtMaterialTextFieldLabel::paintEvent(QPaintEvent *event)
{ {