diff options
| author | Girish Ramakrishnan <girish@Mini-Me.local> | 2009-11-16 18:42:46 +0530 |
|---|---|---|
| committer | Girish Ramakrishnan <girish@Mini-Me.local> | 2009-11-16 18:42:46 +0530 |
| commit | 856f00d75051c6d379f259f98d5f7f31dafcbc10 (patch) | |
| tree | 86b34627f0f6cdf93ebc74168048223d3879083b /mainwindow.cpp | |
| parent | 1464dbd08a3e2cb1888dfa53d1481bdcb74ee7f8 (diff) | |
Revert "animate the webview and the scraps sequentially instead of parallelly"
This reverts commit 5754c93d2bc583ba782f0fc26260e8dbf2141962.
Diffstat (limited to 'mainwindow.cpp')
| -rw-r--r-- | mainwindow.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mainwindow.cpp b/mainwindow.cpp index 5dbc105..d473a5b 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -198,13 +198,13 @@ void MainWindow::createAnimations() { QAbstractAnimation *browserEnter = createBrowserAnim(Enter, this); QAbstractAnimation *browserLeave = createBrowserAnim(Leave, this); - m_browserToScrapsAnimation = new QSequentialAnimationGroup(this); - m_browserToScrapsAnimation->addAnimation(m_scrapsEnter); + m_browserToScrapsAnimation = new QParallelAnimationGroup(this); m_browserToScrapsAnimation->addAnimation(browserLeave); + m_browserToScrapsAnimation->addAnimation(m_scrapsEnter); - m_scrapsToBrowserAnimation = new QSequentialAnimationGroup(this); - m_scrapsToBrowserAnimation->addAnimation(browserEnter); + m_scrapsToBrowserAnimation = new QParallelAnimationGroup(this); m_scrapsToBrowserAnimation->addAnimation(m_scrapsLeave); + m_scrapsToBrowserAnimation->addAnimation(browserEnter); } void MainWindow::addScrapToAnimations(WebScrapContainer *container) { @@ -255,7 +255,7 @@ QAbstractAnimation* MainWindow::createToolbarAnim(GraphicsToolBar *fromToolbar, QSequentialAnimationGroup *seqAnim = new QSequentialAnimationGroup(parent); QPropertyAnimation *rotateAnim1 = new QPropertyAnimation(fromToolbar->rotation(), "angle", seqAnim); fromToolbar->rotation()->setOrigin(QVector3D(fromToolbar->rect().center())); - rotateAnim1->setDuration(800); + rotateAnim1->setDuration(500); rotateAnim1->setStartValue(0.0); if (direction == Clockwise) rotateAnim1->setEndValue(80.0); @@ -270,7 +270,7 @@ QAbstractAnimation* MainWindow::createToolbarAnim(GraphicsToolBar *fromToolbar, QPropertyAnimation *rotateAnim2 = new QPropertyAnimation(toToolbar->rotation(), "angle", seqAnim); toToolbar->rotation()->setOrigin(QVector3D(toToolbar->rect().center())); - rotateAnim2->setDuration(800); + rotateAnim2->setDuration(500); if (direction == Clockwise) rotateAnim2->setStartValue(-80.0); else |