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

port fade to the new api; much simpler and doesn't use a QPropertyAnimation (the two are related ;)

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1058158
This commit is contained in:
Aaron J. Seigo 2009-12-04 01:14:23 +00:00
parent edc7191176
commit a1b48efa16
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
animations/fade.cpp
View File

@ -59,33 +59,40 @@ qreal FadeAnimation::targetOpacity() const
void FadeAnimation::setWidgetToAnimate(QGraphicsWidget *widget)
{
if (widget == widgetToAnimate()) {
return;
}
Animation::setWidgetToAnimate(widget);
if (widget) {
widget->setOpacity(m_startOpacity);
}
}
if (animation.data()) {
delete animation.data();
animation.clear();
void FadeAnimation::updateState(QAbstractAnimation::State oldState, QAbstractAnimation::State newState)
{
QGraphicsWidget *w = widgetToAnimate();
if (!w) {
return;
}
if (oldState == Stopped && newState == Running) {
w->setOpacity(direction() == Forward ? m_startOpacity : m_targetOpacity);
} else if (newState == Stopped) {
w->setOpacity(direction() == Forward ? m_targetOpacity : m_startOpacity);
}
}
QAbstractAnimation* FadeAnimation::render(QObject* parent)
void FadeAnimation::updateCurrentTime(int currentTime)
{
//create animation
QPropertyAnimation* anim = animation.data();
if (!anim) {
QGraphicsWidget *widget = widgetToAnimate();
anim = new QPropertyAnimation(widget, "opacity", widget);
animation = anim;
qDebug()<<"creating";
QGraphicsWidget *w = widgetToAnimate();
if (w) {
qreal delta = currentTime / qreal(duration());
delta = (m_startOpacity - m_targetOpacity) * delta;
w->setOpacity(m_startOpacity - delta);
}
anim->setStartValue(startOpacity());
anim->setEndValue(targetOpacity());
anim->setDuration(duration());
return anim;
Animation::updateCurrentTime(currentTime);
}
} //namespace Plasma

4
animations/fade_p.h
View File

@ -57,10 +57,10 @@ public:
void setWidgetToAnimate(QGraphicsWidget *widget);
protected:
virtual QAbstractAnimation* render(QObject* parent = 0);
void updateState(QAbstractAnimation::State oldState, QAbstractAnimation::State newState);
void updateCurrentTime(int currentTime);
private:
QWeakPointer<QPropertyAnimation> animation;
qreal m_startOpacity;
qreal m_targetOpacity;
};