add zoom animation to new animation api

svn path=/trunk/KDE/kdelibs/; revision=1059117
This commit is contained in:
Igor Trindade Oliveira 2009-12-05 20:23:13 +00:00
parent 5ef6a48563
commit 6cc357bb94
5 changed files with 141 additions and 1 deletions

View File

@ -54,6 +54,7 @@ set(plasma_LIB_SRCS
animations/rotationstacked.cpp animations/rotationstacked.cpp
animations/stackedlayout.cpp animations/stackedlayout.cpp
animations/geo.cpp animations/geo.cpp
animations/zoom.cpp
applet.cpp applet.cpp
configloader.cpp configloader.cpp
containment.cpp containment.cpp

74
animations/zoom.cpp Normal file
View File

@ -0,0 +1,74 @@
/*
* Copyright 2009 Igor Trindade Oliveira <igor.oliveira@indt.org.br>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details
*
* You should have received a copy of the GNU Library General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "zoom_p.h"
#include <kdebug.h>
namespace Plasma
{
ZoomAnimation::ZoomAnimation(QObject *parent)
: Animation(parent),
m_zoom(1)
{
}
ZoomAnimation::~ZoomAnimation()
{
}
void ZoomAnimation::setZoom(qreal zoom)
{
m_zoom = zoom;
}
qreal ZoomAnimation::zoom() const
{
return m_zoom;
}
void ZoomAnimation::updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)
{
QGraphicsWidget *w = widgetToAnimate();
if (!w) {
return;
}
if (oldState == Stopped && newState == Running) {
w->setScale(direction() == Forward ? 1 : m_zoom);
} else if (newState == Stopped) {
w->setScale(direction() == Forward ? m_zoom : 1);
}
}
void ZoomAnimation::updateCurrentTime(int currentTime)
{
QGraphicsWidget *w = widgetToAnimate();
if (w) {
qreal delta = currentTime / qreal(duration());
delta = (1 - m_zoom) * delta;
w->setScale( 1 - delta);
}
Animation::updateCurrentTime(currentTime);
}
} //namespace Plasma

60
animations/zoom_p.h Normal file
View File

@ -0,0 +1,60 @@
/*
* Copyright 2009 Igor Trindade Oliveira <igor.oliveira@indt.org.br>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details
*
* You should have received a copy of the GNU Library General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
/**
* @file This file contains the definition for the Zoom animation.
*/
#ifndef PLASMA_ANIMATIONS_ZOOM_H
#define PLASMA_ANIMATIONS_ZOOM_H
#include <plasma/animations/animation.h>
#include <plasma/plasma_export.h>
namespace Plasma
{
/**
* @class ZoomAnimation plasma/animations/zoom_p.h
* @short Zoom Animation
*
*/
class ZoomAnimation : public Animation
{
Q_OBJECT
Q_PROPERTY(qreal zoom READ zoom WRITE setZoom)
public:
ZoomAnimation(QObject *parent = 0);
virtual ~ZoomAnimation();
qreal zoom() const;
void setZoom(qreal);
protected:
void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState);
void updateCurrentTime(int currentTime);
private:
qreal m_zoom;
};
}
#endif

View File

@ -30,6 +30,7 @@
#include "animations/slide_p.h" #include "animations/slide_p.h"
#include "animations/rotationstacked.h" #include "animations/rotationstacked.h"
#include "animations/geo_p.h" #include "animations/geo_p.h"
#include "animations/zoom_p.h"
namespace Plasma namespace Plasma
{ {
@ -66,6 +67,9 @@ Plasma::Animation* Animator::create(Animator::Animation type, QObject *parent)
case GeoAnimation: case GeoAnimation:
result = new Plasma::GeoAnimation; result = new Plasma::GeoAnimation;
break; break;
case ZoomAnimation:
result = new Plasma::ZoomAnimation;
break;
default: default:
kDebug() << "Unsupported animation type."; kDebug() << "Unsupported animation type.";

View File

@ -63,7 +63,8 @@ public:
RotationAnimation, /*<< Rotate an animated object */ RotationAnimation, /*<< Rotate an animated object */
RotationStackedAnimation, /*<< for flipping one object with another */ RotationStackedAnimation, /*<< for flipping one object with another */
SlideAnimation, /*<< Move the position of animated object */ SlideAnimation, /*<< Move the position of animated object */
GeoAnimation /*<< Geometry animation*/ GeoAnimation, /*<< Geometry animation*/
ZoomAnimation /*<<Zoom animation */
}; };
enum CurveShape { enum CurveShape {