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

Added support for animation movement direction combinations (i.e. MoveUp|MoveLeft) to RotationStacked

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1083639
This commit is contained in:
Bruno de Oliveira Abinader 2010-02-01 18:01:40 +00:00
parent 751e79c666
commit cb7f6a2f2b
2 changed files with 30 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
animations/rotationstacked.cpp
View File

@ -44,47 +44,20 @@ RotationStackedAnimation::~RotationStackedAnimation()
void RotationStackedAnimation::setMovementDirection(const qint8 &direction)
{
m_animDirection = static_cast<MovementDirection>(direction);
m_animDirection = direction;
QVector3D animDirection(0, 0, 0);
switch (m_animDirection) {
case MoveLeft:
animDirection.setY(-1);
break;
case MoveRight:
animDirection.setY(1);
break;
case MoveAny:
case MoveUp:
if ((m_animDirection & MoveUp) == MoveUp) {
animDirection.setX(1);
break;
case MoveDown:
} else if ((m_animDirection & MoveDown) == MoveDown) {
animDirection.setX(-1);
break;
}
case MoveUpLeft:
animDirection.setX(1);
if ((m_animDirection & MoveLeft) == MoveLeft) {
animDirection.setY(-1);
break;
case MoveUpRight:
animDirection.setX(1);
} else if ((m_animDirection & MoveRight) == MoveRight) {
animDirection.setY(1);
break;
case MoveDownLeft:
animDirection.setX(-1);
animDirection.setY(-1);
break;
case MoveDownRight:
animDirection.setX(-1);
animDirection.setY(1);
break;
}
m_frontRotation->setAxis(animDirection);
@ -95,12 +68,12 @@ void RotationStackedAnimation::setMovementDirection(const qint8 &direction)
qint8 RotationStackedAnimation::movementDirection() const
{
return static_cast<qint8>(m_animDirection);
return m_animDirection;
}
void RotationStackedAnimation::setReference(const qint8 &reference)
{
m_reference = reference;
m_animReference = reference;
if (!targetWidget() || !backWidget()) {
return;
@ -111,22 +84,22 @@ void RotationStackedAnimation::setReference(const qint8 &reference)
QVector3D frontTransformOrigin(transformArea.width()/2, transformArea.height()/2, 0);
QVector3D backTransformOrigin(transformArea.width()/2, transformArea.height()/2, 0);
if ((m_reference & Left) == Left) {
frontTransformOrigin.setX(0);
backTransformOrigin.setX(0);
} else if ((m_reference & Right) == Right) {
frontTransformOrigin.setX(transformArea.width());
backTransformOrigin.setX(transformArea.width());
}
if ((m_reference & Up) == Up) {
if ((m_animReference & Up) == Up) {
frontTransformOrigin.setY(0);
backTransformOrigin.setY(0);
} else if ((m_reference & Down) == Down) {
} else if ((m_animReference & Down) == Down) {
frontTransformOrigin.setY(transformArea.height());
backTransformOrigin.setY(transformArea.height());
}
if ((m_animReference & Left) == Left) {
frontTransformOrigin.setX(0);
backTransformOrigin.setX(0);
} else if ((m_animReference & Right) == Right) {
frontTransformOrigin.setX(transformArea.width());
backTransformOrigin.setX(transformArea.width());
}
m_frontRotation->setOrigin(frontTransformOrigin);
m_backRotation->setOrigin(backTransformOrigin);
@ -135,7 +108,7 @@ void RotationStackedAnimation::setReference(const qint8 &reference)
qint8 RotationStackedAnimation::reference() const
{
return m_reference;
return m_animReference;
}
QGraphicsWidget *RotationStackedAnimation::backWidget()

22
animations/rotationstacked_p.h
View File

@ -55,26 +55,26 @@ public:
~RotationStackedAnimation();
/**
* Set the animation direction
* Set the animation movement direction (e.g. MoveAny, MoveUp, MoveDown,
* MoveLeft, MoveRight) which can be combined (i.e. MoveUp|MoveLeft).
* @arg direction animation direction
*/
void setMovementDirection(const qint8 &direction);
/**
* Get the animation direction
* Get the animation movement direction.
*/
qint8 movementDirection() const;
/**
* Set rotation reference (e.g. Center, Up, Down, Left, Right) can
* be combined (i.e. Center|Up)
* @arg reference The reference
* Set the animation rotation reference (e.g. Center, Up, Down, Left,
* Right) which can be combined (i.e. Center|Up).
* @arg reference animation reference
*/
void setReference(const qint8 &reference);
/**
* Rotation reference (e.g. Center, Up, Down, Left, Right) can
* be combined (i.e. Center|Up)
* Get the animation rotation reference.
*/
qint8 reference() const;
@ -106,10 +106,10 @@ private:
*/
void updateTransformations();
/** Reference, the default is Center (see \ref Animation::Reference) */
qint8 m_reference;
/** Animation direction, the default is MoveUp (see \ref Animation::MovementDirection) */
MovementDirection m_animDirection;
/** Animation reference (see \ref Animation::Reference) */
qint8 m_animReference;
/** Animation movement direction (see \ref Animation::MovementDirection) */
qint8 m_animDirection;
/** Object the animation(s) should act upon. */
QWeakPointer<QGraphicsWidget> m_backWidget;
/** Layout where widget would be added */