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

make sure all animations have a parent

This commit is contained in:
laserpants 2016-06-21 15:17:52 +03:00
parent 415c9576ce
commit 427dd30f03
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
components/slider_internal.cpp
View File

@ -52,10 +52,10 @@ SliderStateMachine::SliderStateMachine(Slider *parent,
transition = new QSignalTransition(this, SIGNAL(noFocusMouseEnter())); transition = new QSignalTransition(this, SIGNAL(noFocusMouseEnter()));
transition->setTargetState(_focusState); transition->setTargetState(_focusState);
animation = new QPropertyAnimation(thumb, "haloSize"); animation = new QPropertyAnimation(thumb, "haloSize", this);
animation->setEasingCurve(QEasingCurve::InOutSine); animation->setEasingCurve(QEasingCurve::InOutSine);
transition->addAnimation(animation); transition->addAnimation(animation);
transition->addAnimation(new QPropertyAnimation(track, "fillColor")); transition->addAnimation(new QPropertyAnimation(track, "fillColor", this));
_inactiveState->addTransition(transition); _inactiveState->addTransition(transition);
// Show halo on focus in // Show halo on focus in
@ -63,10 +63,10 @@ SliderStateMachine::SliderStateMachine(Slider *parent,
transition = new QEventTransition(parent, QEvent::FocusIn); transition = new QEventTransition(parent, QEvent::FocusIn);
transition->setTargetState(_focusState); transition->setTargetState(_focusState);
animation = new QPropertyAnimation(thumb, "haloSize"); animation = new QPropertyAnimation(thumb, "haloSize", this);
animation->setEasingCurve(QEasingCurve::InOutSine); animation->setEasingCurve(QEasingCurve::InOutSine);
transition->addAnimation(animation); transition->addAnimation(animation);
transition->addAnimation(new QPropertyAnimation(track, "fillColor")); transition->addAnimation(new QPropertyAnimation(track, "fillColor", this));
_inactiveState->addTransition(transition); _inactiveState->addTransition(transition);
// Hide halo on focus out // Hide halo on focus out
@ -74,10 +74,10 @@ SliderStateMachine::SliderStateMachine(Slider *parent,
transition = new QEventTransition(parent, QEvent::FocusOut); transition = new QEventTransition(parent, QEvent::FocusOut);
transition->setTargetState(_inactiveState); transition->setTargetState(_inactiveState);
animation = new QPropertyAnimation(thumb, "haloSize"); animation = new QPropertyAnimation(thumb, "haloSize", this);
animation->setEasingCurve(QEasingCurve::InOutSine); animation->setEasingCurve(QEasingCurve::InOutSine);
transition->addAnimation(animation); transition->addAnimation(animation);
transition->addAnimation(new QPropertyAnimation(track, "fillColor")); transition->addAnimation(new QPropertyAnimation(track, "fillColor", this));
_focusState->addTransition(transition); _focusState->addTransition(transition);
// Hide halo on mouse leave, except if widget has focus // Hide halo on mouse leave, except if widget has focus
@ -85,10 +85,10 @@ SliderStateMachine::SliderStateMachine(Slider *parent,
transition = new QSignalTransition(this, SIGNAL(noFocusMouseLeave())); transition = new QSignalTransition(this, SIGNAL(noFocusMouseLeave()));
transition->setTargetState(_inactiveState); transition->setTargetState(_inactiveState);
animation = new QPropertyAnimation(thumb, "haloSize"); animation = new QPropertyAnimation(thumb, "haloSize", this);
animation->setEasingCurve(QEasingCurve::InOutSine); animation->setEasingCurve(QEasingCurve::InOutSine);
transition->addAnimation(animation); transition->addAnimation(animation);
transition->addAnimation(new QPropertyAnimation(track, "fillColor")); transition->addAnimation(new QPropertyAnimation(track, "fillColor", this));
_focusState->addTransition(transition); _focusState->addTransition(transition);
// Pulse in // Pulse in
@ -96,7 +96,7 @@ SliderStateMachine::SliderStateMachine(Slider *parent,
transition = new QSignalTransition(_pulseOutState, SIGNAL(propertiesAssigned())); transition = new QSignalTransition(_pulseOutState, SIGNAL(propertiesAssigned()));
transition->setTargetState(_pulseInState); transition->setTargetState(_pulseInState);
animation = new QPropertyAnimation(thumb, "haloSize"); animation = new QPropertyAnimation(thumb, "haloSize", this);
animation->setEasingCurve(QEasingCurve::InOutSine); animation->setEasingCurve(QEasingCurve::InOutSine);
animation->setDuration(1000); animation->setDuration(1000);
transition->addAnimation(animation); transition->addAnimation(animation);
@ -107,7 +107,7 @@ SliderStateMachine::SliderStateMachine(Slider *parent,
transition = new QSignalTransition(_pulseInState, SIGNAL(propertiesAssigned())); transition = new QSignalTransition(_pulseInState, SIGNAL(propertiesAssigned()));
transition->setTargetState(_pulseOutState); transition->setTargetState(_pulseOutState);
animation = new QPropertyAnimation(thumb, "haloSize"); animation = new QPropertyAnimation(thumb, "haloSize", this);
animation->setEasingCurve(QEasingCurve::InOutSine); animation->setEasingCurve(QEasingCurve::InOutSine);
animation->setDuration(1000); animation->setDuration(1000);
transition->addAnimation(animation); transition->addAnimation(animation);
@ -117,11 +117,11 @@ SliderStateMachine::SliderStateMachine(Slider *parent,
transition = new QSignalTransition(parent, SIGNAL(sliderPressed())); transition = new QSignalTransition(parent, SIGNAL(sliderPressed()));
transition->setTargetState(_slidingState); transition->setTargetState(_slidingState);
animation = new QPropertyAnimation(thumb, "diameter"); animation = new QPropertyAnimation(thumb, "diameter", this);
animation->setDuration(70); animation->setDuration(70);
transition->addAnimation(animation); transition->addAnimation(animation);
animation = new QPropertyAnimation(thumb, "haloSize"); animation = new QPropertyAnimation(thumb, "haloSize", this);
animation->setEasingCurve(QEasingCurve::InOutSine); animation->setEasingCurve(QEasingCurve::InOutSine);
transition->addAnimation(animation); transition->addAnimation(animation);
_focusState->addTransition(transition); _focusState->addTransition(transition);
@ -130,11 +130,11 @@ SliderStateMachine::SliderStateMachine(Slider *parent,
transition = new QSignalTransition(parent, SIGNAL(sliderReleased())); transition = new QSignalTransition(parent, SIGNAL(sliderReleased()));
transition->setTargetState(_focusState); transition->setTargetState(_focusState);
animation = new QPropertyAnimation(thumb, "diameter"); animation = new QPropertyAnimation(thumb, "diameter", this);
animation->setDuration(70); animation->setDuration(70);
transition->addAnimation(animation); transition->addAnimation(animation);
animation = new QPropertyAnimation(thumb, "haloSize"); animation = new QPropertyAnimation(thumb, "haloSize", this);
animation->setEasingCurve(QEasingCurve::InOutSine); animation->setEasingCurve(QEasingCurve::InOutSine);
transition->addAnimation(animation); transition->addAnimation(animation);
_slidingState->addTransition(transition); _slidingState->addTransition(transition);
@ -149,19 +149,19 @@ SliderStateMachine::SliderStateMachine(Slider *parent,
transition = new QSignalTransition(this, SIGNAL(changedFromMinimum())); transition = new QSignalTransition(this, SIGNAL(changedFromMinimum()));
transition->setTargetState(_normalState); transition->setTargetState(_normalState);
animation = new QPropertyAnimation(thumb, "fillColor"); animation = new QPropertyAnimation(thumb, "fillColor", this);
animation->setDuration(200); animation->setDuration(200);
transition->addAnimation(animation); transition->addAnimation(animation);
animation = new QPropertyAnimation(thumb, "haloColor"); animation = new QPropertyAnimation(thumb, "haloColor", this);
animation->setDuration(300); animation->setDuration(300);
transition->addAnimation(animation); transition->addAnimation(animation);
animation = new QPropertyAnimation(thumb, "borderColor"); animation = new QPropertyAnimation(thumb, "borderColor", this);
animation->setDuration(200); animation->setDuration(200);
transition->addAnimation(animation); transition->addAnimation(animation);
animation = new QPropertyAnimation(thumb, "borderWidth"); animation = new QPropertyAnimation(thumb, "borderWidth", this);
animation->setDuration(200); animation->setDuration(200);
transition->addAnimation(animation); transition->addAnimation(animation);
@ -170,19 +170,19 @@ SliderStateMachine::SliderStateMachine(Slider *parent,
transition = new QSignalTransition(this, SIGNAL(changedToMinimum())); transition = new QSignalTransition(this, SIGNAL(changedToMinimum()));
transition->setTargetState(_minState); transition->setTargetState(_minState);
animation = new QPropertyAnimation(thumb, "fillColor"); animation = new QPropertyAnimation(thumb, "fillColor", this);
animation->setDuration(200); animation->setDuration(200);
transition->addAnimation(animation); transition->addAnimation(animation);
animation = new QPropertyAnimation(thumb, "haloColor"); animation = new QPropertyAnimation(thumb, "haloColor", this);
animation->setDuration(300); animation->setDuration(300);
transition->addAnimation(animation); transition->addAnimation(animation);
animation = new QPropertyAnimation(thumb, "borderColor"); animation = new QPropertyAnimation(thumb, "borderColor", this);
animation->setDuration(200); animation->setDuration(200);
transition->addAnimation(animation); transition->addAnimation(animation);
animation = new QPropertyAnimation(thumb, "borderWidth"); animation = new QPropertyAnimation(thumb, "borderWidth", this);
animation->setDuration(200); animation->setDuration(200);
transition->addAnimation(animation); transition->addAnimation(animation);