From c4ff5c53efc213d9ce4fe0cfe9ab3d6c13cd8716 Mon Sep 17 00:00:00 2001
From: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
Date: Fri, 19 Oct 2012 16:35:54 +0200
Subject: Mac: Adapt scrollbar fadeout animation for QStyleAnimation

Change-Id: I39f1089e8d6ba1bb412d33aa4ebc0971aba52681
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
---
 src/widgets/styles/qmacstyle_mac.mm  | 9 ++++++++-
 src/widgets/styles/qmacstyle_mac_p.h | 4 +++-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm
index 38f4dc3abc..2b6f271a40 100644
--- a/src/widgets/styles/qmacstyle_mac.mm
+++ b/src/widgets/styles/qmacstyle_mac.mm
@@ -1739,7 +1739,6 @@ bool QMacStylePrivate::addWidget(QWidget *w)
         bool isScrollBar = (qobject_cast<QScrollBar *>(w));
         if (isScrollBar) {
             w->installEventFilter(q);
-            startAnimate(AquaScrollBar, w);
             return true;
         }
     }
@@ -5106,6 +5105,14 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex
                                           QMacStylePrivate::ScrollBarFadeOutDuration);
                 info.cleared = opacity <= 0.0;
 
+                if (info.animating && info.cleared) {
+                    d->stopAnimation(slider->styleObject);
+                    info.animating = false;
+                } else if (!info.animating && !info.cleared) {
+                    d->startAnimation(new QStyleAnimation(slider->styleObject));
+                    info.animating = true;
+                }
+
                 CGContextBeginTransparencyLayerWithRect(cg, qt_hirectForQRect(slider->rect), NULL);
                 CGContextSetAlpha(cg, opacity);
 
diff --git a/src/widgets/styles/qmacstyle_mac_p.h b/src/widgets/styles/qmacstyle_mac_p.h
index 812c79e158..66691c63f7 100644
--- a/src/widgets/styles/qmacstyle_mac_p.h
+++ b/src/widgets/styles/qmacstyle_mac_p.h
@@ -211,7 +211,8 @@ public:
               lastUpdate(QDateTime::currentMSecsSinceEpoch()),
               hovered(false),
               lastHovered(0),
-              cleared(false)
+              cleared(false),
+              animating(false)
         {}
         int lastValue;
         int lastMinimum;
@@ -221,6 +222,7 @@ public:
         bool hovered;
         qint64 lastHovered;
         bool cleared;
+        bool animating;
     };
     mutable QMap<const QWidget*, OverlayScrollBarInfo> scrollBarInfos;
 
-- 
cgit v1.2.3