remove a bit of nonesense =)
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=871924
This commit is contained in:
parent
6374635bf3
commit
771c946872
@ -531,15 +531,17 @@ void Icon::hoverAnimationUpdate(qreal progress)
|
|||||||
} else {
|
} else {
|
||||||
// If we mouse leaves before the fade in is done, fade out from where we were,
|
// If we mouse leaves before the fade in is done, fade out from where we were,
|
||||||
// not from fully faded in
|
// not from fully faded in
|
||||||
qreal new_alpha = d->m_fadeIn ? progress : 1 - progress;
|
d->m_hoverAlpha = qMin(1 - progress, d->m_hoverAlpha);
|
||||||
d->m_hoverAlpha = qMin(new_alpha, d->m_hoverAlpha);
|
|
||||||
}
|
}
|
||||||
if (progress == 1) {
|
|
||||||
|
if (qFuzzyCompare(qreal(1.0), progress)) {
|
||||||
d->m_hoverAnimId = -1;
|
d->m_hoverAnimId = -1;
|
||||||
|
|
||||||
|
if (!d->m_fadeIn) {
|
||||||
|
d->states &= ~IconPrivate::HoverState;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (!d->m_fadeIn && progress == 1) {
|
|
||||||
d->states &= ~IconPrivate::HoverState;
|
|
||||||
}
|
|
||||||
update();
|
update();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user