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

unbreak the animation of text background

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=954953
This commit is contained in:
Marco Martin 2009-04-16 15:41:56 +00:00
parent f904ed3fac
commit 63c009bf68
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
widgets/iconwidget.cpp
View File

@ -653,8 +653,7 @@ QPixmap IconWidgetPrivate::decoration(const QStyleOptionGraphicsItem *option, bo
result = result.scaled(result.size() * 0.9, Qt::KeepAspectRatio); result = result.scaled(result.size() * 0.9, Qt::KeepAspectRatio);
} }
// We disable the iconeffect here since we cannot get it into sync with
// the fade animation. TODO: Enable it when animations are switched off
if (!result.isNull() && useHoverEffect) { if (!result.isNull() && useHoverEffect) {
KIconEffect *effect = KIconLoader::global()->iconEffect(); KIconEffect *effect = KIconLoader::global()->iconEffect();
// Note that in KIconLoader terminology, active = hover. // Note that in KIconLoader terminology, active = hover.
@ -983,12 +982,12 @@ void IconWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option
} }
if (state == IconWidgetPrivate::NoState && d->textBgColor != QColor() && if (d->textBgColor != QColor() &&
!(d->text.isEmpty() && d->infoText.isEmpty())) { !(d->text.isEmpty() && d->infoText.isEmpty())) {
QRectF rect = textBoundingRect.adjusted(-2, -2, 4, 4); QRectF rect = textBoundingRect.adjusted(-2, -2, 4, 4);
painter->setPen(Qt::transparent); painter->setPen(Qt::transparent);
QColor color = d->textBgColor; QColor color = d->textBgColor;
color.setAlpha(60 * 1.0 - d->hoverAlpha); color.setAlpha(60 * (1.0 - d->hoverAlpha));
painter->setBrush(color); painter->setBrush(color);
painter->setRenderHint(QPainter::Antialiasing); painter->setRenderHint(QPainter::Antialiasing);
painter->drawPath(PaintUtils::roundedRectangle(rect, 4)); painter->drawPath(PaintUtils::roundedRectangle(rect, 4));