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 13:25:07 +03:00
parent aa73c87251
commit f04c353dfb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/flatbutton_internal.cpp
View File

@ -54,8 +54,8 @@ FlatButtonDelegate::FlatButtonDelegate(FlatButton *parent)
QSequentialAnimationGroup *group = new QSequentialAnimationGroup(this); QSequentialAnimationGroup *group = new QSequentialAnimationGroup(this);
QPropertyAnimation *grow = new QPropertyAnimation; QPropertyAnimation *grow = new QPropertyAnimation(this);
QPropertyAnimation *shrink = new QPropertyAnimation; QPropertyAnimation *shrink = new QPropertyAnimation(this);
grow->setTargetObject(this); grow->setTargetObject(this);
grow->setPropertyName("haloScaleFactor"); grow->setPropertyName("haloScaleFactor");
@ -205,19 +205,19 @@ void FlatButtonDelegate::addTransition(QAbstractTransition *transition,
QPropertyAnimation *animation; QPropertyAnimation *animation;
animation = new QPropertyAnimation(this, "backgroundOpacity"); animation = new QPropertyAnimation(this, "backgroundOpacity", this);
animation->setDuration(150); animation->setDuration(150);
transition->addAnimation(animation); transition->addAnimation(animation);
animation = new QPropertyAnimation(this, "backgroundColor"); animation = new QPropertyAnimation(this, "backgroundColor", this);
animation->setDuration(150); animation->setDuration(150);
transition->addAnimation(animation); transition->addAnimation(animation);
animation = new QPropertyAnimation(this, "haloOpacity"); animation = new QPropertyAnimation(this, "haloOpacity", this);
animation->setDuration(170); animation->setDuration(170);
transition->addAnimation(animation); transition->addAnimation(animation);
animation = new QPropertyAnimation(this, "haloSize"); animation = new QPropertyAnimation(this, "haloSize", this);
animation->setDuration(350); animation->setDuration(350);
animation->setEasingCurve(QEasingCurve::OutCubic); animation->setEasingCurve(QEasingCurve::OutCubic);
transition->addAnimation(animation); transition->addAnimation(animation);