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

Fixing double deletion by using QWeakPointer (suggestion by Aaron Seigo).

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1070099
This commit is contained in:
Adenilson Cavalcanti Da Silva 2010-01-04 21:11:02 +00:00
parent 6d3b0437c6
commit 2d08b8a2b2
2 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
animations/pulser.cpp
View File

@ -21,8 +21,9 @@
#include <QGraphicsWidget> #include <QGraphicsWidget>
#include <QParallelAnimationGroup> #include <QParallelAnimationGroup>
#include <QPropertyAnimation> #include <QPropertyAnimation>
#include <QWeakPointer>
#include <kdebug.h> #include <kdebug.h>
namespace Plasma namespace Plasma
{ {
@ -31,14 +32,12 @@ PulseAnimation::PulseAnimation(QObject *parent)
m_zvalue(0), m_zvalue(0),
m_scale(0), m_scale(0),
m_opacity(0), m_opacity(0),
m_endScale(1.5), m_endScale(1.5)
m_under(0)
{ {
} }
PulseAnimation::~PulseAnimation() PulseAnimation::~PulseAnimation()
{ {
delete m_under;
} }
void PulseAnimation::setCopy() void PulseAnimation::setCopy()
@ -46,31 +45,30 @@ void PulseAnimation::setCopy()
QGraphicsWidget *target = targetWidget(); QGraphicsWidget *target = targetWidget();
if (!target) { if (!target) {
delete m_under; m_under.clear();
m_under = 0;
return; return;
} }
if (!m_under) { if (!m_under.data()) {
m_under = new ShadowFake; m_under = new ShadowFake;
} }
m_under->setTarget(target); m_under.data()->setTarget(target);
m_zvalue = target->zValue() - 1; m_zvalue = target->zValue() - 1;
m_scale = target->scale(); m_scale = target->scale();
m_under->setOpacity(m_opacity); m_under.data()->setOpacity(m_opacity);
m_under->setScale(m_scale); m_under.data()->setScale(m_scale);
m_under->setZValue(m_zvalue); m_under.data()->setZValue(m_zvalue);
} }
void PulseAnimation::resetPulser() void PulseAnimation::resetPulser()
{ {
if (m_under) { if (m_under.data()) {
m_under->setOpacity(m_opacity); m_under.data()->setOpacity(m_opacity);
m_under->setScale(m_scale); m_under.data()->setScale(m_scale);
m_under->setZValue(m_zvalue); m_under.data()->setZValue(m_zvalue);
} }
} }
@ -81,12 +79,12 @@ void PulseAnimation::updateState(QAbstractAnimation::State newState, QAbstractAn
} }
if (oldState == Stopped && newState == Running) { if (oldState == Stopped && newState == Running) {
if (!m_under || m_under->target() != targetWidget() || m_under->size() != targetWidget()->size()) { if (!m_under.data() || m_under.data()->target() != targetWidget() || m_under.data()->size() != targetWidget()->size()) {
setCopy(); setCopy();
} }
m_under->setOpacity(direction() == Forward ? 1 : 0); m_under.data()->setOpacity(direction() == Forward ? 1 : 0);
m_under->setScale(direction() == Forward ? m_scale : m_endScale); m_under.data()->setScale(direction() == Forward ? m_scale : m_endScale);
} else if (newState == Stopped) { } else if (newState == Stopped) {
resetPulser(); resetPulser();
} }
@ -94,16 +92,16 @@ void PulseAnimation::updateState(QAbstractAnimation::State newState, QAbstractAn
void PulseAnimation::updateCurrentTime(int currentTime) void PulseAnimation::updateCurrentTime(int currentTime)
{ {
if (m_under) { if (m_under.data()) {
qreal delta = Animation::easingCurve().valueForProgress( currentTime / qreal(duration())); qreal delta = Animation::easingCurve().valueForProgress( currentTime / qreal(duration()));
delta = (1 - m_endScale) * delta; delta = (1 - m_endScale) * delta;
m_under->setScale(1 - delta); m_under.data()->setScale(1 - delta);
delta = currentTime / qreal(duration()); delta = currentTime / qreal(duration());
if (direction() == Forward) { if (direction() == Forward) {
m_under->setOpacity(1.0 - delta); m_under.data()->setOpacity(1.0 - delta);
} else if (direction() == Backward) { } else if (direction() == Backward) {
m_under->setOpacity(delta); m_under.data()->setOpacity(delta);
} }
} }
} }

2
animations/pulser_p.h
View File

@ -79,7 +79,7 @@ private:
/** The shadow copy (it really is a QGraphicsWidget with a pixmap /** The shadow copy (it really is a QGraphicsWidget with a pixmap
* copy of the original widget). * copy of the original widget).
*/ */
ShadowFake *m_under; QWeakPointer<ShadowFake> m_under;
}; };
} }