RaisedButton moved to md namespace.
This commit is contained in:
parent
5651ee3ed2
commit
b8cb380b32
|
@ -4,6 +4,8 @@
|
|||
#include <QtWidgets/QGraphicsDropShadowEffect>
|
||||
#include <QPropertyAnimation>
|
||||
#include <QEventTransition>
|
||||
namespace md
|
||||
{
|
||||
|
||||
/*!
|
||||
* \class QtMaterialRaisedButtonPrivate
|
||||
|
@ -13,24 +15,24 @@
|
|||
/*!
|
||||
* \internal
|
||||
*/
|
||||
QtMaterialRaisedButtonPrivate::QtMaterialRaisedButtonPrivate(QtMaterialRaisedButton *q)
|
||||
: QtMaterialFlatButtonPrivate(q)
|
||||
RaisedButtonPrivate::RaisedButtonPrivate(RaisedButton *q)
|
||||
: FlatButtonPrivate(q)
|
||||
{
|
||||
}
|
||||
|
||||
/*!
|
||||
* \internal
|
||||
*/
|
||||
QtMaterialRaisedButtonPrivate::~QtMaterialRaisedButtonPrivate()
|
||||
RaisedButtonPrivate::~RaisedButtonPrivate()
|
||||
{
|
||||
}
|
||||
|
||||
/*!
|
||||
* \internal
|
||||
*/
|
||||
void QtMaterialRaisedButtonPrivate::init()
|
||||
void RaisedButtonPrivate::init()
|
||||
{
|
||||
Q_Q(QtMaterialRaisedButton);
|
||||
Q_Q(RaisedButton);
|
||||
|
||||
shadowStateMachine = new QStateMachine(q);
|
||||
normalState = new QState;
|
||||
|
@ -87,33 +89,33 @@ void QtMaterialRaisedButtonPrivate::init()
|
|||
* \class QtMaterialRaisedButton
|
||||
*/
|
||||
|
||||
QtMaterialRaisedButton::QtMaterialRaisedButton(QWidget *parent)
|
||||
: QtMaterialFlatButton(*new QtMaterialRaisedButtonPrivate(this), parent)
|
||||
RaisedButton::RaisedButton(QWidget *parent)
|
||||
: FlatButton(*new RaisedButtonPrivate(this), parent)
|
||||
{
|
||||
d_func()->init();
|
||||
}
|
||||
|
||||
QtMaterialRaisedButton::QtMaterialRaisedButton(const QString &text, QWidget *parent)
|
||||
: QtMaterialFlatButton(*new QtMaterialRaisedButtonPrivate(this), parent)
|
||||
RaisedButton::RaisedButton(const QString &text, QWidget *parent)
|
||||
: FlatButton(*new RaisedButtonPrivate(this), parent)
|
||||
{
|
||||
d_func()->init();
|
||||
|
||||
setText(text);
|
||||
}
|
||||
|
||||
QtMaterialRaisedButton::~QtMaterialRaisedButton()
|
||||
RaisedButton::~RaisedButton()
|
||||
{
|
||||
}
|
||||
|
||||
QtMaterialRaisedButton::QtMaterialRaisedButton(QtMaterialRaisedButtonPrivate &d, QWidget *parent)
|
||||
: QtMaterialFlatButton(d, parent)
|
||||
RaisedButton::RaisedButton(RaisedButtonPrivate &d, QWidget *parent)
|
||||
: FlatButton(d, parent)
|
||||
{
|
||||
d_func()->init();
|
||||
}
|
||||
|
||||
bool QtMaterialRaisedButton::event(QEvent *event)
|
||||
bool RaisedButton::event(QEvent *event)
|
||||
{
|
||||
Q_D(QtMaterialRaisedButton);
|
||||
Q_D(RaisedButton);
|
||||
|
||||
if (QEvent::EnabledChange == event->type()) {
|
||||
if (isEnabled()) {
|
||||
|
@ -124,5 +126,6 @@ bool QtMaterialRaisedButton::event(QEvent *event)
|
|||
d->effect->setEnabled(false);
|
||||
}
|
||||
}
|
||||
return QtMaterialFlatButton::event(event);
|
||||
return FlatButton::event(event);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2,26 +2,28 @@
|
|||
#define QTMATERIALRAISEDBUTTON_H
|
||||
|
||||
#include "qtmaterialflatbutton.h"
|
||||
namespace md
|
||||
{
|
||||
|
||||
class QtMaterialRaisedButtonPrivate;
|
||||
class RaisedButtonPrivate;
|
||||
|
||||
class QtMaterialRaisedButton : public QtMaterialFlatButton
|
||||
class RaisedButton : public FlatButton
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit QtMaterialRaisedButton(QWidget *parent = 0);
|
||||
explicit QtMaterialRaisedButton(const QString &text, QWidget *parent = 0);
|
||||
~QtMaterialRaisedButton();
|
||||
explicit RaisedButton(QWidget *parent = 0);
|
||||
explicit RaisedButton(const QString &text, QWidget *parent = 0);
|
||||
~RaisedButton();
|
||||
|
||||
protected:
|
||||
QtMaterialRaisedButton(QtMaterialRaisedButtonPrivate &d, QWidget *parent = 0);
|
||||
RaisedButton(RaisedButtonPrivate &d, QWidget *parent = 0);
|
||||
|
||||
bool event(QEvent *event) Q_DECL_OVERRIDE;
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(QtMaterialRaisedButton)
|
||||
Q_DECLARE_PRIVATE(QtMaterialRaisedButton)
|
||||
Q_DISABLE_COPY(RaisedButton)
|
||||
Q_DECLARE_PRIVATE(RaisedButton)
|
||||
};
|
||||
|
||||
}
|
||||
#endif // QTMATERIALRAISEDBUTTON_H
|
||||
|
|
|
@ -2,20 +2,22 @@
|
|||
#define QTMATERIALRAISEDBUTTON_P_H
|
||||
|
||||
#include "qtmaterialflatbutton_p.h"
|
||||
namespace md
|
||||
{
|
||||
|
||||
class QStateMachine;
|
||||
class QState;
|
||||
class QGraphicsDropShadowEffect;
|
||||
class QtMaterialRaisedButton;
|
||||
class RaisedButton;
|
||||
|
||||
class QtMaterialRaisedButtonPrivate : public QtMaterialFlatButtonPrivate
|
||||
class RaisedButtonPrivate : public FlatButtonPrivate
|
||||
{
|
||||
Q_DISABLE_COPY(QtMaterialRaisedButtonPrivate)
|
||||
Q_DECLARE_PUBLIC(QtMaterialRaisedButton)
|
||||
Q_DISABLE_COPY(RaisedButtonPrivate)
|
||||
Q_DECLARE_PUBLIC(RaisedButton)
|
||||
|
||||
public:
|
||||
QtMaterialRaisedButtonPrivate(QtMaterialRaisedButton *q);
|
||||
~QtMaterialRaisedButtonPrivate();
|
||||
RaisedButtonPrivate(RaisedButton *q);
|
||||
~RaisedButtonPrivate();
|
||||
|
||||
void init();
|
||||
|
||||
|
@ -24,5 +26,5 @@ public:
|
|||
QState *pressedState;
|
||||
QGraphicsDropShadowEffect *effect;
|
||||
};
|
||||
|
||||
}
|
||||
#endif // QTMATERIALRAISEDBUTTON_P_H
|
||||
|
|
Loading…
Reference in New Issue