alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

while properties are cool and all, let's not take the slow path just because we can.

Browse Source
This commit is contained in:
Aaron Seigo 2011-12-02 10:39:48 +01:00
parent 34376c31b1
commit 109453976a
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
widgets/iconwidget.cpp
View File

@ -757,20 +757,19 @@ void IconWidgetPrivate::animateMainIcon(bool show, const IconWidgetStates state)
QPropertyAnimation *animation = hoverAnimation->animation(); QPropertyAnimation *animation = hoverAnimation->animation();
if (!animation) { if (!animation) {
animation = new QPropertyAnimation(hoverAnimation, "value"); animation = new QPropertyAnimation(hoverAnimation, "value");
animation->setProperty("duration", 150); animation->setDuration(150);
animation->setProperty("easingCurve", QEasingCurve::OutQuad); animation->setEasingCurve(QEasingCurve::OutQuad);
animation->setProperty("startValue", 0.0); animation->setStartValue(0.0);
animation->setProperty("endValue", 1.0); animation->setEndValue(1.0);
hoverAnimation->setAnimation(animation); hoverAnimation->setAnimation(animation);
q->connect(animation, SIGNAL(finished()), q, SLOT(hoverAnimationFinished())); q->connect(animation, SIGNAL(finished()), q, SLOT(hoverAnimationFinished()));
} else if (animation->state() == QAbstractAnimation::Running) { } else if (animation->state() == QAbstractAnimation::Running) {
animation->pause(); animation->pause();
} }
animation->setProperty("direction", show ? animation->setDirection(show ? QAbstractAnimation::Forward : QAbstractAnimation::Backward);
QAbstractAnimation::Forward : QAbstractAnimation::Backward); animation->start(show ? QAbstractAnimation::KeepWhenStopped : QAbstractAnimation::DeleteWhenStopped);
animation->start(show ? q->update();
QAbstractAnimation::KeepWhenStopped : QAbstractAnimation::DeleteWhenStopped);
} }
void IconWidgetPrivate::hoverAnimationFinished() void IconWidgetPrivate::hoverAnimationFinished()
@ -1474,7 +1473,6 @@ void IconWidget::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
d->oldIcon = QIcon(); d->oldIcon = QIcon();
d->animateMainIcon(true, d->states|IconWidgetPrivate::HoverState); d->animateMainIcon(true, d->states|IconWidgetPrivate::HoverState);
update();
QGraphicsWidget::hoverEnterEvent(event); QGraphicsWidget::hoverEnterEvent(event);
} }
@ -1491,7 +1489,6 @@ void IconWidget::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
d->states &= ~IconWidgetPrivate::PressedState; d->states &= ~IconWidgetPrivate::PressedState;
d->animateMainIcon(false, d->states|IconWidgetPrivate::HoverState); d->animateMainIcon(false, d->states|IconWidgetPrivate::HoverState);
update();
QGraphicsWidget::hoverLeaveEvent(event); QGraphicsWidget::hoverLeaveEvent(event);
} }
@ -1502,10 +1499,8 @@ bool IconWidget::sceneEventFilter(QGraphicsItem *watched, QEvent *event)
if (event->type() == QEvent::GraphicsSceneDragEnter) { if (event->type() == QEvent::GraphicsSceneDragEnter) {
d->animateMainIcon(true, d->states|IconWidgetPrivate::HoverState); d->animateMainIcon(true, d->states|IconWidgetPrivate::HoverState);
update();
} else if (event->type() == QEvent::GraphicsSceneDragLeave) { } else if (event->type() == QEvent::GraphicsSceneDragLeave) {
d->animateMainIcon(false, d->states|IconWidgetPrivate::HoverState); d->animateMainIcon(false, d->states|IconWidgetPrivate::HoverState);
update();
} }
return false; return false;