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

growanimation ported

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1058993
This commit is contained in:
Marco Martin 2009-12-05 13:53:25 +00:00
parent 6a91177566
commit 5001706078
2 changed files with 52 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
animations/grow.cpp
View File

@ -40,24 +40,31 @@ qreal GrowAnimation::factor() const
return m_animFactor;
}
void GrowAnimation::setWidgetToAnimate(QGraphicsWidget *widget)
void GrowAnimation::updateCurrentTime(int currentTime)
{
Animation::setWidgetToAnimate(widget);
if (animation.data()) {
delete animation.data();
animation.clear();
QGraphicsWidget *w = widgetToAnimate();
if (w && state() == QAbstractAnimation::Running) {
qreal delta = currentTime / qreal(duration());
QRectF geometry;
geometry.setTopLeft(m_startGeometry.topLeft() * (1-delta) + (m_targetGeometry.topLeft() * delta));
geometry.setSize(m_startGeometry.size() * (1-delta) + (m_targetGeometry.size() * delta));
w->setGeometry(geometry);
}
}
QAbstractAnimation* GrowAnimation::render(QObject* parent){
void GrowAnimation::updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)
{
if (oldState == QAbstractAnimation::Stopped && newState == QAbstractAnimation::Running) {
QGraphicsWidget *widget = widgetToAnimate();
if (!widget) {
return;
}
//get current geometry values
QGraphicsWidget *m_object = widgetToAnimate();
QRectF geometry = m_object->geometry();
QSizeF minimum = m_object->effectiveSizeHint(Qt::MinimumSize);
QSizeF maximum = m_object->effectiveSizeHint(Qt::MaximumSize);
qreal w = geometry.width();
qreal h = geometry.height();
QSizeF minimum = widget->effectiveSizeHint(Qt::MinimumSize);
QSizeF maximum = widget->effectiveSizeHint(Qt::MaximumSize);
m_startGeometry = widget->geometry();
qreal w = m_startGeometry.width();
qreal h = m_startGeometry.height();
qreal factor = m_animFactor;
//compute new geometry values
@ -73,35 +80,21 @@ QAbstractAnimation* GrowAnimation::render(QObject* parent){
qreal newX;
qreal newY;
newX = geometry.x() - (newWidth - w)/2;
newY = geometry.y() - (newHeight - h)/2;
//Recreate only if needed
QPropertyAnimation *anim = animation.data();
if (!anim) {
anim = new QPropertyAnimation(m_object, "geometry", m_object);
animation = anim;
}
//Prevents from deforming (with multiple clicks)
QAbstractAnimation::State temp = anim->state();
if (temp == QAbstractAnimation::Running) {
return anim;
}
newX = m_startGeometry.x() - (newWidth - w)/2;
newY = m_startGeometry.y() - (newHeight - h)/2;
if (direction() == QAbstractAnimation::Forward) {
anim->setStartValue(QRectF(geometry.x(), geometry.y(), w, h));
anim->setEndValue(QRectF(newX, newY, newWidth, newHeight));
//the end geometry gets rounded to prevent things looking ugly
m_targetGeometry = QRect(newX, newY, newWidth, newHeight);
} else {
anim->setStartValue(QRectF(newX, newY, newWidth, newHeight));
anim->setEndValue(QRectF(geometry.x(), geometry.y(), w, h));
m_targetGeometry = m_startGeometry;
m_startGeometry = QRectF(newX, newY, newWidth, newHeight);
}
qDebug()<<"start value:"<<anim->startValue()<<"end value:"<<anim->endValue();
kDebug()<<"start value:"<<m_startGeometry<<"end value:"<<m_targetGeometry;
anim->setDuration(duration());
}
return anim;
}
} //namespace Plasma

9
animations/grow_p.h
View File

@ -52,14 +52,15 @@ public:
void setFactor(const qreal factor);
void setWidgetToAnimate(QGraphicsWidget *widget);
protected:
virtual QAbstractAnimation* render(QObject* parent = 0);
void updateCurrentTime(int currentTime);
void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState);
private:
qreal m_animFactor;
QWeakPointer<QPropertyAnimation> animation;
QRectF m_startGeometry;
QRectF m_targetGeometry;
};
}