summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoopesh Chander <roop@forwardbias.in>2009-11-16 11:29:48 +0100
committerRoopesh Chander <roop@forwardbias.in>2009-11-16 11:29:48 +0100
commit5754c93d2bc583ba782f0fc26260e8dbf2141962 (patch)
tree619d753fe5d6fb1cdb5d7dc5ba3b7eb02599d7a4
parent1a10302e0010fdfee02b46cebb3c839c7c6e5084 (diff)
animate the webview and the scraps sequentially instead of parallelly
-rw-r--r--mainwindow.cpp12
-rw-r--r--mainwindow.h2
2 files changed, 7 insertions, 7 deletions
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 8731960..4b8a6db 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -195,13 +195,13 @@ void MainWindow::createAnimations() {
QAbstractAnimation *browserEnter = createBrowserAnim(Enter, this);
QAbstractAnimation *browserLeave = createBrowserAnim(Leave, this);
- m_browserToScrapsAnimation = new QParallelAnimationGroup(this);
- m_browserToScrapsAnimation->addAnimation(browserLeave);
+ m_browserToScrapsAnimation = new QSequentialAnimationGroup(this);
m_browserToScrapsAnimation->addAnimation(m_scrapsEnter);
+ m_browserToScrapsAnimation->addAnimation(browserLeave);
- m_scrapsToBrowserAnimation = new QParallelAnimationGroup(this);
- m_scrapsToBrowserAnimation->addAnimation(m_scrapsLeave);
+ m_scrapsToBrowserAnimation = new QSequentialAnimationGroup(this);
m_scrapsToBrowserAnimation->addAnimation(browserEnter);
+ m_scrapsToBrowserAnimation->addAnimation(m_scrapsLeave);
}
void MainWindow::addScrapToAnimations(WebScrapContainer *container) {
@@ -254,7 +254,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(500);
+ rotateAnim1->setDuration(800);
rotateAnim1->setStartValue(0.0);
if (direction == Clockwise)
rotateAnim1->setEndValue(80.0);
@@ -269,7 +269,7 @@ QAbstractAnimation* MainWindow::createToolbarAnim(GraphicsToolBar *fromToolbar,
QPropertyAnimation *rotateAnim2 = new QPropertyAnimation(toToolbar->rotation(), "angle", seqAnim);
toToolbar->rotation()->setOrigin(QVector3D(toToolbar->rect().center()));
- rotateAnim2->setDuration(500);
+ rotateAnim2->setDuration(800);
if (direction == Clockwise)
rotateAnim2->setStartValue(-80.0);
else
diff --git a/mainwindow.h b/mainwindow.h
index 1f2ee4c..091ae09 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -91,7 +91,7 @@ private:
GraphicsToolBar *m_browserToolbar;
// animations
- QParallelAnimationGroup *m_browserToScrapsAnimation, *m_scrapsToBrowserAnimation;
+ QSequentialAnimationGroup *m_browserToScrapsAnimation, *m_scrapsToBrowserAnimation;
QParallelAnimationGroup *m_scrapsEnter, *m_scrapsLeave;
QAbstractAnimation *m_toBrowserToolbarAnimation, *m_toScrapsToolbarAnimation;
};