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

make state machine member pointer type

This commit is contained in:
laserpants 2016-06-13 00:17:46 +03:00
parent 57e77ecc04
commit 309e9eb5a8
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/raisedbutton.cpp
View File

@ -23,6 +23,8 @@ void RaisedButtonPrivate::init()
{ {
Q_Q(RaisedButton); Q_Q(RaisedButton);
machine = new QStateMachine(q);
q->setTextColor(Qt::white); q->setTextColor(Qt::white);
q->setPeakOpacity(0.25); q->setPeakOpacity(0.25);
@ -35,8 +37,8 @@ void RaisedButtonPrivate::init()
normalState = new QState; normalState = new QState;
pressedState = new QState; pressedState = new QState;
machine.addState(normalState); machine->addState(normalState);
machine.addState(pressedState); machine->addState(pressedState);
normalState->assignProperty(effect, "offset", QPointF(0, 0)); normalState->assignProperty(effect, "offset", QPointF(0, 0));
normalState->assignProperty(effect, "blurRadius", 7); normalState->assignProperty(effect, "blurRadius", 7);
@ -91,8 +93,8 @@ void RaisedButtonPrivate::init()
// //
machine.setInitialState(normalState); machine->setInitialState(normalState);
machine.start(); machine->start();
} }
RaisedButton::RaisedButton(QWidget *parent) RaisedButton::RaisedButton(QWidget *parent)
@ -140,10 +142,10 @@ bool RaisedButton::event(QEvent *event)
if (QEvent::EnabledChange == event->type()) { if (QEvent::EnabledChange == event->type()) {
if (isEnabled()) { if (isEnabled()) {
d->machine.start(); d->machine->start();
d->effect->setEnabled(true); d->effect->setEnabled(true);
} else { } else {
d->machine.stop(); d->machine->stop();
d->effect->setEnabled(false); d->effect->setEnabled(false);
} }
} }

6
components/raisedbutton_p.h
View File

@ -16,9 +16,9 @@ public:
void init(); void init();
QStateMachine machine; QStateMachine *machine;
QState *normalState; QState *normalState;
QState *pressedState; QState *pressedState;
QGraphicsDropShadowEffect *effect; QGraphicsDropShadowEffect *effect;
QColor disabledBackgroundColor; QColor disabledBackgroundColor;
}; };

13
components/toggle.cpp
View File

@ -27,15 +27,16 @@ void TogglePrivate::init()
Q_Q(Toggle); Q_Q(Toggle);
ripple = new RippleOverlay(q->parentWidget()); ripple = new RippleOverlay(q->parentWidget());
machine = new QStateMachine(q);
q->setCheckable(true); q->setCheckable(true);
q->setChecked(false); q->setChecked(false);
q->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); q->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
machine.addState(offState); machine->addState(offState);
machine.addState(onState); machine->addState(onState);
machine.setInitialState(offState); machine->setInitialState(offState);
QSignalTransition *transition; QSignalTransition *transition;
QPropertyAnimation *animation; QPropertyAnimation *animation;
@ -101,7 +102,7 @@ void TogglePrivate::init()
QObject::connect(q, SIGNAL(toggled(bool)), q, SLOT(addRipple())); QObject::connect(q, SIGNAL(toggled(bool)), q, SLOT(addRipple()));
machine.start(); machine->start();
QCoreApplication::processEvents(); QCoreApplication::processEvents();
} }
@ -290,9 +291,9 @@ bool Toggle::event(QEvent *event)
{ {
case QEvent::EnabledChange: case QEvent::EnabledChange:
if (isEnabled()) { if (isEnabled()) {
d->machine.start(); d->machine->start();
} else { } else {
d->machine.stop(); d->machine->stop();
} }
break; break;
case QEvent::ParentChange: case QEvent::ParentChange:

2
components/toggle_p.h
View File

@ -26,7 +26,7 @@ public:
QState *const offState; QState *const offState;
QState *const onState; QState *const onState;
RippleOverlay *ripple; RippleOverlay *ripple;
QStateMachine machine; QStateMachine *machine;
Qt::Orientation orientation; Qt::Orientation orientation;
QColor disabledColor; QColor disabledColor;
QColor activeColor; QColor activeColor;