diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2012-10-30 13:47:20 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-02 19:49:22 +0100 |
commit | 3c2bfbff5f4c836de32628710ab7701b0db083f7 (patch) | |
tree | 4e6c262f6cbaa4978bcf47b239423fe305af50bb /tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp | |
parent | 020196d16b6c25e16bf80483f08e0007a27eab13 (diff) |
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>
Diffstat (limited to 'tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp')
-rw-r--r-- | tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
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); |