dont use properties on the scrap. it's a bit awkward.

1 files changed, 7 insertions, 8 deletions

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 3f34eca..5e31150 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -8,6 +8,7 @@
 #include <QWebFrame>
 #include <QState>
 #include <QSignalTransition>
+#include <QPropertyAnimation>
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "webview.h"
@@ -210,7 +211,7 @@ void MainWindow::addScrapToAnimations(WebScrapContainer *container) {
 
     QPropertyAnimation *enterAnim = new QPropertyAnimation(container, "pos", this);
     enterAnim->setDuration(500 + 150 * m_scraps.count());
-    enterAnim->setEndValue(container->data(WebScrapContainer::Position).toPointF());
+    enterAnim->setEndValue(pos());
     enterAnim->setEasingCurve(QEasingCurve::OutCubic);
     m_scrapsEnter->addAnimation(enterAnim);
 
@@ -220,16 +221,16 @@ void MainWindow::addScrapToAnimations(WebScrapContainer *container) {
     leaveAnim->setEasingCurve(QEasingCurve::InCubic);
     m_scrapsLeave->addAnimation(leaveAnim);
 
-    container->setData(WebScrapContainer::EnterAnimation, qVariantFromValue(enterAnim));
-    container->setData(WebScrapContainer::LeaveAnimation, qVariantFromValue(leaveAnim));
+    container->setEnterAnimation(enterAnim);
+    container->setLeaveAnimation(leaveAnim);
 }
 
 void MainWindow::removeScrapFromAnimations(WebScrapContainer *container) {
-    QPropertyAnimation *enterAnim = container->data(WebScrapContainer::EnterAnimation).value<QPropertyAnimation*>();
+    QPropertyAnimation *enterAnim = container->enterAnimation();
     m_scrapsEnter->removeAnimation(enterAnim);
     enterAnim->deleteLater();
 
-    QPropertyAnimation *leaveAnim = container->data(WebScrapContainer::LeaveAnimation).value<QPropertyAnimation*>();
+    QPropertyAnimation *leaveAnim = container->leaveAnimation();
     m_scrapsLeave->removeAnimation(leaveAnim);
     leaveAnim->deleteLater();
 }
@@ -375,9 +376,7 @@ void MainWindow::saveSettings() {
             m_settings->setValue("pageSize", scrap->page()->viewportSize());
             m_settings->setValue("topLeft", scrap->scrapRect().topLeft());
             m_settings->setValue("size", scrap->scrapRect().size());
-            QPointF containerPos = container->pos();
-            if (!sceneRect().contains(containerPos))
-                containerPos = container->data(WebScrapContainer::Position).toPoint();
+            QPointF containerPos = container->enterAnimation()->endValue().toPointF();
             m_settings->setValue("pos", (containerPos + scrap->pos()).toPoint());
             m_settings->setValue("xScale", container->scrapScale()->xScale());
             m_settings->setValue("yScale", container->scrapScale()->yScale());