RaisedButton moved to md namespace.

This commit is contained in:
Achraf k 2022-02-17 03:42:34 +01:00
parent 5651ee3ed2
commit b8cb380b32
3 changed files with 38 additions and 31 deletions

View File

@ -4,6 +4,8 @@
#include <QtWidgets/QGraphicsDropShadowEffect> #include <QtWidgets/QGraphicsDropShadowEffect>
#include <QPropertyAnimation> #include <QPropertyAnimation>
#include <QEventTransition> #include <QEventTransition>
namespace md
{
/*! /*!
* \class QtMaterialRaisedButtonPrivate * \class QtMaterialRaisedButtonPrivate
@ -13,24 +15,24 @@
/*! /*!
* \internal * \internal
*/ */
QtMaterialRaisedButtonPrivate::QtMaterialRaisedButtonPrivate(QtMaterialRaisedButton *q) RaisedButtonPrivate::RaisedButtonPrivate(RaisedButton *q)
: QtMaterialFlatButtonPrivate(q) : FlatButtonPrivate(q)
{ {
} }
/*! /*!
* \internal * \internal
*/ */
QtMaterialRaisedButtonPrivate::~QtMaterialRaisedButtonPrivate() RaisedButtonPrivate::~RaisedButtonPrivate()
{ {
} }
/*! /*!
* \internal * \internal
*/ */
void QtMaterialRaisedButtonPrivate::init() void RaisedButtonPrivate::init()
{ {
Q_Q(QtMaterialRaisedButton); Q_Q(RaisedButton);
shadowStateMachine = new QStateMachine(q); shadowStateMachine = new QStateMachine(q);
normalState = new QState; normalState = new QState;
@ -87,33 +89,33 @@ void QtMaterialRaisedButtonPrivate::init()
* \class QtMaterialRaisedButton * \class QtMaterialRaisedButton
*/ */
QtMaterialRaisedButton::QtMaterialRaisedButton(QWidget *parent) RaisedButton::RaisedButton(QWidget *parent)
: QtMaterialFlatButton(*new QtMaterialRaisedButtonPrivate(this), parent) : FlatButton(*new RaisedButtonPrivate(this), parent)
{ {
d_func()->init(); d_func()->init();
} }
QtMaterialRaisedButton::QtMaterialRaisedButton(const QString &text, QWidget *parent) RaisedButton::RaisedButton(const QString &text, QWidget *parent)
: QtMaterialFlatButton(*new QtMaterialRaisedButtonPrivate(this), parent) : FlatButton(*new RaisedButtonPrivate(this), parent)
{ {
d_func()->init(); d_func()->init();
setText(text); setText(text);
} }
QtMaterialRaisedButton::~QtMaterialRaisedButton() RaisedButton::~RaisedButton()
{ {
} }
QtMaterialRaisedButton::QtMaterialRaisedButton(QtMaterialRaisedButtonPrivate &d, QWidget *parent) RaisedButton::RaisedButton(RaisedButtonPrivate &d, QWidget *parent)
: QtMaterialFlatButton(d, parent) : FlatButton(d, parent)
{ {
d_func()->init(); 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 (QEvent::EnabledChange == event->type()) {
if (isEnabled()) { if (isEnabled()) {
@ -124,5 +126,6 @@ bool QtMaterialRaisedButton::event(QEvent *event)
d->effect->setEnabled(false); d->effect->setEnabled(false);
} }
} }
return QtMaterialFlatButton::event(event); return FlatButton::event(event);
}
} }

View File

@ -2,26 +2,28 @@
#define QTMATERIALRAISEDBUTTON_H #define QTMATERIALRAISEDBUTTON_H
#include "qtmaterialflatbutton.h" #include "qtmaterialflatbutton.h"
namespace md
{
class QtMaterialRaisedButtonPrivate; class RaisedButtonPrivate;
class QtMaterialRaisedButton : public QtMaterialFlatButton class RaisedButton : public FlatButton
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit QtMaterialRaisedButton(QWidget *parent = 0); explicit RaisedButton(QWidget *parent = 0);
explicit QtMaterialRaisedButton(const QString &text, QWidget *parent = 0); explicit RaisedButton(const QString &text, QWidget *parent = 0);
~QtMaterialRaisedButton(); ~RaisedButton();
protected: protected:
QtMaterialRaisedButton(QtMaterialRaisedButtonPrivate &d, QWidget *parent = 0); RaisedButton(RaisedButtonPrivate &d, QWidget *parent = 0);
bool event(QEvent *event) Q_DECL_OVERRIDE; bool event(QEvent *event) Q_DECL_OVERRIDE;
private: private:
Q_DISABLE_COPY(QtMaterialRaisedButton) Q_DISABLE_COPY(RaisedButton)
Q_DECLARE_PRIVATE(QtMaterialRaisedButton) Q_DECLARE_PRIVATE(RaisedButton)
}; };
}
#endif // QTMATERIALRAISEDBUTTON_H #endif // QTMATERIALRAISEDBUTTON_H

View File

@ -2,20 +2,22 @@
#define QTMATERIALRAISEDBUTTON_P_H #define QTMATERIALRAISEDBUTTON_P_H
#include "qtmaterialflatbutton_p.h" #include "qtmaterialflatbutton_p.h"
namespace md
{
class QStateMachine; class QStateMachine;
class QState; class QState;
class QGraphicsDropShadowEffect; class QGraphicsDropShadowEffect;
class QtMaterialRaisedButton; class RaisedButton;
class QtMaterialRaisedButtonPrivate : public QtMaterialFlatButtonPrivate class RaisedButtonPrivate : public FlatButtonPrivate
{ {
Q_DISABLE_COPY(QtMaterialRaisedButtonPrivate) Q_DISABLE_COPY(RaisedButtonPrivate)
Q_DECLARE_PUBLIC(QtMaterialRaisedButton) Q_DECLARE_PUBLIC(RaisedButton)
public: public:
QtMaterialRaisedButtonPrivate(QtMaterialRaisedButton *q); RaisedButtonPrivate(RaisedButton *q);
~QtMaterialRaisedButtonPrivate(); ~RaisedButtonPrivate();
void init(); void init();
@ -24,5 +26,5 @@ public:
QState *pressedState; QState *pressedState;
QGraphicsDropShadowEffect *effect; QGraphicsDropShadowEffect *effect;
}; };
}
#endif // QTMATERIALRAISEDBUTTON_P_H #endif // QTMATERIALRAISEDBUTTON_P_H