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

Fixed IconWidget's item action animation (s/ZoomAnimation/PixmapTransitionAnimation)

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1087296
This commit is contained in:
Bruno de Oliveira Abinader 2010-02-08 19:27:12 +00:00
parent 262289bd48
commit 22c390a768
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
widgets/iconwidget.cpp
View File

@ -179,36 +179,32 @@ void IconAction::show()
{
Animation *animation = m_animation.data();
if (!animation) {
animation = Plasma::Animator::create(Plasma::Animator::PixmapTransitionAnimation);
animation = Plasma::Animator::create(Plasma::Animator::PixmapTransitionAnimation, m_icon);
animation->setTargetWidget(m_icon);
animation->setProperty("targetPixmap", m_pixmap);
m_animation = animation;
} else if (animation->state() == QAbstractAnimation::Running) {
animation->pause();
}
rebuildPixmap();
animation->setDirection(QAbstractAnimation::Forward);
animation->start(QAbstractAnimation::DeleteWhenStopped);
m_visible = true;
animation->setProperty("targetPixmap", m_pixmap);
animation->setDirection(QAbstractAnimation::Forward);
animation->start();
}
void IconAction::hide()
{
Animation *animation = m_animation.data();
if (!animation) {
animation = Plasma::Animator::create(Plasma::Animator::ZoomAnimation);
animation->setTargetWidget(m_icon);
animation->setProperty("targetPixmap", m_pixmap);
} else if (animation->state() == QAbstractAnimation::Running) {
if (animation->state() == QAbstractAnimation::Running) {
animation->pause();
}
rebuildPixmap();
m_visible = false;
animation->setDirection(QAbstractAnimation::Backward);
animation->start(QAbstractAnimation::DeleteWhenStopped);
m_visible = false;
}
bool IconAction::isVisible() const
@ -218,7 +214,7 @@ bool IconAction::isVisible() const
bool IconAction::isAnimating() const
{
return (m_animation.data() && m_animation.data()->state() == QAbstractAnimation::Running);
return !m_animation.isNull();
}
bool IconAction::isPressed() const
@ -254,10 +250,7 @@ QRectF IconAction::rect() const
void IconAction::rebuildPixmap()
{
// Determine proper QIcon mode based on selection status
QIcon::Mode mode = QIcon::Normal;
if (m_selected) {
mode = QIcon::Selected;
}
QIcon::Mode mode = m_selected ? QIcon::Selected : QIcon::Normal;
// Draw everything
m_pixmap = QPixmap(26, 26);
@ -350,7 +343,7 @@ void IconAction::paint(QPainter *painter) const
}
Animation *animation = m_animation.data();
if (m_visible && animation->property("currentPixmap").isNull()) {
if (m_visible && !animation) {
painter->drawPixmap(m_rect.toRect(), m_pixmap);
} else {
painter->drawPixmap(m_rect.toRect(),