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

Move duplicated animation starting code into Layout::startAnimation() which layout subclasses can call at the end of their setGeometry() implementation to start the layout animator's timer.

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=707803
This commit is contained in:
Robert Knight 2007-09-03 00:52:29 +00:00
parent ecd23d6e67
commit 15fbaba2ac
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
widgets/boxlayout.cpp
View File

@ -438,12 +438,7 @@ void BoxLayout::setGeometry(const QRectF& geo)
d->geometry = geometry; d->geometry = geometry;
if ( animator() && animator()->timeLine() ) { startAnimation();
animator()->timeLine()->setCurrentTime(0);
if ( animator()->timeLine()->state() == QTimeLine::NotRunning ) {
animator()->timeLine()->start();
}
}
} }

3
widgets/flowlayout.cpp
View File

@ -193,8 +193,7 @@ void FlowLayout::setGeometry(const QRectF& geo)
d->geometry = geo; d->geometry = geo;
if ( animator() && animator()->timeLine() ) startAnimation();
animator()->timeLine()->start();
} }
Qt::Orientations FlowLayout::expandingDirections() const Qt::Orientations FlowLayout::expandingDirections() const

11
widgets/layout.cpp
View File

@ -21,9 +21,11 @@
#include <math.h> #include <math.h>
#include <QtCore/QList> #include <QtCore/QList>
#include <QtCore/QTimeLine>
#include <QtDebug> #include <QtDebug>
#include "widget.h" #include "widget.h"
#include "layoutanimator.h"
namespace Plasma namespace Plasma
{ {
@ -146,5 +148,14 @@ QSizeF Layout::maximumSize() const
{ {
return QSizeF(INFINITY,INFINITY); return QSizeF(INFINITY,INFINITY);
} }
void Layout::startAnimation()
{
if ( animator() && animator()->timeLine() ) {
animator()->timeLine()->setCurrentTime(0);
if ( animator()->timeLine()->state() == QTimeLine::NotRunning ) {
animator()->timeLine()->start();
}
}
}
} }

10
widgets/layout.h
View File

@ -152,6 +152,16 @@ class PLASMA_EXPORT Layout : public LayoutItem
/** TODO Document me */ /** TODO Document me */
void invalidate(); void invalidate();
protected:
/**
* Starts a layout animation. Subclasses may call this
* at the end of their setGeometry() implementation to
* start the timeline associated with the layout's animator()
* if there is one. If an animation is already in progress then
* the timeline is reset to 0ms and the animation continues.
*/
void startAnimation();
private: private:
class Private; class Private;
Private *const d; Private *const d;