[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/libs/plasma/widgets
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2008-10-16 4:27:20
Message-ID: 1224131240.838275.23478.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 871924 by aseigo:

remove a bit of nonesense =)


 M  +8 -6      icon.cpp  


--- trunk/KDE/kdebase/workspace/libs/plasma/widgets/icon.cpp #871923:871924
@@ -531,15 +531,17 @@
     } else {
         // If we mouse leaves before the fade in is done, fade out from where we were,
         // not from fully faded in
-        qreal new_alpha = d->m_fadeIn ? progress : 1 - progress;
-        d->m_hoverAlpha = qMin(new_alpha, d->m_hoverAlpha);
+        d->m_hoverAlpha = qMin(1 - progress, d->m_hoverAlpha);
     }
-    if (progress == 1) {
+
+    if (qFuzzyCompare(qreal(1.0), progress)) {
         d->m_hoverAnimId = -1;
+
+        if (!d->m_fadeIn) {
+            d->states &= ~IconPrivate::HoverState;
+        }
     }
-    if (!d->m_fadeIn && progress == 1) {
-        d->states &= ~IconPrivate::HoverState;
-    }
+
     update();
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]