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

IconItem: Use better approach to disable animation when going from invisible to visible

Browse Source 
Clearing the pixmap is actually wrong, because in some cases the
IconItem::updatePolish() is not called when changing visibility.

REVIEW: 128409
This commit is contained in:
David Rosca 2016-07-12 10:02:47 +02:00
parent 80dcba46b5
commit 9070f461bb
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/declarativeimports/core/iconitem.cpp
View File

@ -48,6 +48,7 @@ IconItem::IconItem(QQuickItem *parent)
m_textureChanged(false),
m_sizeChanged(false),
m_allowNextAnimation(false),
m_blockNextAnimation(false),
m_colorGroup(Plasma::Theme::NormalColorGroup),
m_animValue(0)
{
@ -461,7 +462,7 @@ void IconItem::loadPixmap()
m_textureChanged = true;
//don't animate initial setting
if ((m_animated || m_allowNextAnimation) && !m_oldIconPixmap.isNull() && !m_sizeChanged) {
if ((m_animated || m_allowNextAnimation) && !m_oldIconPixmap.isNull() && !m_sizeChanged && !m_blockNextAnimation) {
m_animValue = 0.0;
m_animation->setStartValue((qreal)0);
m_animation->setEndValue((qreal)1);
@ -470,6 +471,7 @@ void IconItem::loadPixmap()
} else {
m_animValue = 1.0;
m_animation->stop();
m_blockNextAnimation = false;
}
update();
}
@ -477,8 +479,7 @@ void IconItem::loadPixmap()
void IconItem::itemChange(ItemChange change, const ItemChangeData &value)
{
if (change == ItemVisibleHasChanged && value.boolValue) {
// Clear pixmap to disable animation
m_iconPixmap = QPixmap();
m_blockNextAnimation = true;
}
QQuickItem::itemChange(change, value);

1
src/declarativeimports/core/iconitem.h
View File

@ -188,6 +188,7 @@ private:
bool m_textureChanged;
bool m_sizeChanged;
bool m_allowNextAnimation;
bool m_blockNextAnimation;
QPixmap m_iconPixmap;
QPixmap m_oldIconPixmap;