Mac: refactor scrollbar animations

Get rid of QWidget-centric QMacStyle::eventFilter() and implement the
fade out animations for scrollbars using QNumberStyleAnimation-based
QFadeOutAnimation.

Change-Id: I2000fa50d46b153e981ceafc12a53932a196382e
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>

3 files changed, 19 insertions, 16 deletions

diff --git a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
index 7e246e5936..5aea32996c 100644
--- a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
+++ b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
@@ -1585,12 +1585,15 @@ void tst_QListWidget::task217070_scrollbarsAdjusted()
     v.setUniformItemSizes(true);
     v.resize(160,100);
     QTest::qWait(50);
+    QScrollBar *hbar = v.horizontalScrollBar();
+    QScrollBar *vbar = v.verticalScrollBar();
+    QVERIFY(hbar && vbar);
     for(int f=150; f>90 ; f--) {
         v.resize(f,100);
         QTest::qWait(30);
-        QVERIFY(v.verticalScrollBar()->isVisible());
-        //the vertical scrollbar must not be visible.
-        QVERIFY(!v.horizontalScrollBar()->isVisible());
+        QVERIFY(vbar->style()->styleHint(QStyle::SH_ScrollBar_Transient) || vbar->isVisible());
+        //the horizontal scrollbar must not be visible.
+        QVERIFY(!hbar->isVisible());
     }
 }
 
diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
index 80d77aa652..9038ae3b00 100644
--- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
+++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
@@ -2696,7 +2696,7 @@ void tst_QTableView::indexAt_data()
       << 0 << 0;   // expected
 
     QTest::newRow("no hidden, no span, scroll (5,0), at (20,20)")
-      << 10 << 10  // dim
+      << 20 << 20  // dim
       << 40 << 40  // size
       << -1 << -1  // hide
       << -1 << -1  // pos
@@ -2706,7 +2706,7 @@ void tst_QTableView::indexAt_data()
       << 0 << 5;   // expected
 
     QTest::newRow("no hidden, no span, scroll (0,5), at (20,20)")
-      << 10 << 10  // dim
+      << 20 << 20  // dim
       << 40 << 40  // size
       << -1 << -1  // hide
       << -1 << -1  // pos
@@ -2716,7 +2716,7 @@ void tst_QTableView::indexAt_data()
       << 5 << 0;   // expected
 
     QTest::newRow("no hidden, no span, scroll (5,5), at (20,20)")
-      << 10 << 10  // dim
+      << 20 << 20  // dim
       << 40 << 40  // size
       << -1 << -1  // hide
       << -1 << -1  // pos
diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
index 6fa9c10ddf..51a49f467d 100644
--- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
+++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
@@ -2105,40 +2105,40 @@ void tst_QMdiArea::updateScrollBars()
 
     QScrollBar *hbar = mdiArea.horizontalScrollBar();
     QVERIFY(hbar);
-    QVERIFY(!hbar->isVisible());
+    QVERIFY(hbar->style()->styleHint(QStyle::SH_ScrollBar_Transient) || !hbar->isVisible());
 
     QScrollBar *vbar = mdiArea.verticalScrollBar();
     QVERIFY(vbar);
-    QVERIFY(!vbar->isVisible());
+    QVERIFY(vbar->style()->styleHint(QStyle::SH_ScrollBar_Transient) || !vbar->isVisible());
 
     // Move sub-window 2 away.
     subWindow2->move(10000, 10000);
     qApp->processEvents();
-    QVERIFY(hbar->isVisible());
-    QVERIFY(vbar->isVisible());
+    QVERIFY(hbar->style()->styleHint(QStyle::SH_ScrollBar_Transient) || hbar->isVisible());
+    QVERIFY(vbar->style()->styleHint(QStyle::SH_ScrollBar_Transient) || vbar->isVisible());
 
     for (int i = 0; i < 2; ++i) {
     // Maximize sub-window 1 and make sure we don't have any scroll bars.
     subWindow1->showMaximized();
     qApp->processEvents();
     QVERIFY(subWindow1->isMaximized());
-    QVERIFY(!hbar->isVisible());
-    QVERIFY(!vbar->isVisible());
+    QVERIFY(hbar->style()->styleHint(QStyle::SH_ScrollBar_Transient) || !hbar->isVisible());
+    QVERIFY(vbar->style()->styleHint(QStyle::SH_ScrollBar_Transient) || !vbar->isVisible());
 
     // We still shouldn't get any scroll bars.
     mdiArea.resize(mdiArea.size() - QSize(20, 20));
     QVERIFY(QTest::qWaitForWindowExposed(&mdiArea));
     qApp->processEvents();
     QVERIFY(subWindow1->isMaximized());
-    QVERIFY(!hbar->isVisible());
-    QVERIFY(!vbar->isVisible());
+    QVERIFY(hbar->style()->styleHint(QStyle::SH_ScrollBar_Transient) || !hbar->isVisible());
+    QVERIFY(vbar->style()->styleHint(QStyle::SH_ScrollBar_Transient) || !vbar->isVisible());
 
     // Restore sub-window 1 and make sure we have scroll bars again.
     subWindow1->showNormal();
     qApp->processEvents();
     QVERIFY(!subWindow1->isMaximized());
-    QVERIFY(hbar->isVisible());
-    QVERIFY(vbar->isVisible());
+    QVERIFY(hbar->style()->styleHint(QStyle::SH_ScrollBar_Transient) || hbar->isVisible());
+    QVERIFY(vbar->style()->styleHint(QStyle::SH_ScrollBar_Transient) || vbar->isVisible());
         if (i == 0) {
             // Now, do the same when the viewport is scrolled.
             hbar->setValue(1000);