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

since we are now using a range of 0-1, there's no real need for *Completed methods, just pass in 1

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=679744
This commit is contained in:
Aaron J. Seigo 2007-06-24 20:22:19 +00:00
parent 2e78ff6e5e
commit a45a0c2e5f
3 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
animator.cpp
View File

@ -66,33 +66,18 @@ void Animator::appear(qreal frame, QGraphicsItem* item)
Q_UNUSED(item) Q_UNUSED(item)
} }
void Animator::appearCompleted(QGraphicsItem* item)
{
Q_UNUSED(item)
}
void Animator::disappear(qreal frame, QGraphicsItem* item) void Animator::disappear(qreal frame, QGraphicsItem* item)
{ {
Q_UNUSED(frame) Q_UNUSED(frame)
Q_UNUSED(item) Q_UNUSED(item)
} }
void Animator::disappearCompleted(QGraphicsItem* item)
{
Q_UNUSED(item)
}
void Animator::activate(qreal frame, QGraphicsItem* item) void Animator::activate(qreal frame, QGraphicsItem* item)
{ {
Q_UNUSED(frame) Q_UNUSED(frame)
Q_UNUSED(item) Q_UNUSED(item)
} }
void Animator::activateCompleted(QGraphicsItem* item)
{
Q_UNUSED(item)
}
void Animator::frameAppear(qreal frame, QGraphicsItem* item, const QRegion& drawable) void Animator::frameAppear(qreal frame, QGraphicsItem* item, const QRegion& drawable)
{ {
Q_UNUSED(frame) Q_UNUSED(frame)
@ -100,12 +85,6 @@ void Animator::frameAppear(qreal frame, QGraphicsItem* item, const QRegion& draw
Q_UNUSED(drawable) Q_UNUSED(drawable)
} }
void Animator::frameAppearCompleted(QGraphicsItem* item, const QRegion& drawable)
{
Q_UNUSED(item)
Q_UNUSED(drawable)
}
void Animator::renderBackground(QImage& background) void Animator::renderBackground(QImage& background)
{ {
Q_UNUSED(background) Q_UNUSED(background)

7
animator.h
View File

@ -48,16 +48,9 @@ public:
virtual QPixmap elementDisappear(qreal frame, const QPixmap& pixmap); virtual QPixmap elementDisappear(qreal frame, const QPixmap& pixmap);
virtual void appear(qreal frame, QGraphicsItem* item); virtual void appear(qreal frame, QGraphicsItem* item);
virtual void appearCompleted(QGraphicsItem* item);
virtual void disappear(qreal frame, QGraphicsItem* item); virtual void disappear(qreal frame, QGraphicsItem* item);
virtual void disappearCompleted(QGraphicsItem* item);
virtual void frameAppear(qreal frame, QGraphicsItem* item, const QRegion& drawable); virtual void frameAppear(qreal frame, QGraphicsItem* item, const QRegion& drawable);
virtual void frameAppearCompleted(QGraphicsItem* item, const QRegion& drawable);
virtual void activate(qreal frame, QGraphicsItem* item); virtual void activate(qreal frame, QGraphicsItem* item);
virtual void activateCompleted(QGraphicsItem* item);
virtual void renderBackground(QImage& background); virtual void renderBackground(QImage& background);
}; };

8
phase.cpp
View File

@ -217,16 +217,16 @@ void Phase::animationComplete()
switch (state.animation) { switch (state.animation) {
case Appear: case Appear:
d->animator->appearCompleted(state.item); d->animator->appear(1, state.item);
break; break;
case Disappear: case Disappear:
d->animator->disappearCompleted(state.item); d->animator->disappear(1, state.item);
break; break;
case Activate: case Activate:
d->animator->activateCompleted(state.item); d->animator->activate(1, state.item);
break; break;
case FrameAppear: case FrameAppear:
d->animator->frameAppearCompleted(state.item, QRegion()); //FIXME: what -is- the frame region? d->animator->frameAppear(1, state.item, QRegion()); //FIXME: what -is- the frame region?
break; break;
} }