keep track of the size of the page when the scrap was added. helps keep it looking the same.

1 files changed, 9 insertions, 6 deletions

diff --git a/mainwindow.cpp b/mainwindow.cpp
index fb875bf..e572f7b 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -41,11 +41,12 @@ void MainWindow::initScrapBoard() {
     createScrapsToolbar(gs);
 }
 
-void MainWindow::addScrap(QUrl url,
+void MainWindow::addScrap(QUrl url, QSize pageSize,
                           QRect scrapRect, QPoint position,
                           qreal xScale, qreal yScale,
                           int refreshIntervalMins) {
     WebScrap *webscrap = new WebScrap(url, scrapRect);
+    webscrap->page()->setViewportSize(pageSize);
     webscrap->setRefreshInterval(refreshIntervalMins * 60 * 1000); // milliseconds
     WebScrapContainer *container = new WebScrapContainer(webscrap, scene(), xScale, yScale);
     container->setPos(position - webscrap->pos());
@@ -65,8 +66,8 @@ void MainWindow::initBrowser() {
     m_webView->load(QUrl("http://news.google.com/"));
     connect(m_webView, SIGNAL(loadFinished(bool)), SLOT(adjustLocation()));
     connect(m_webView, SIGNAL(titleChanged(const QString&)), SLOT(adjustTitle()));
-    connect(m_webView, SIGNAL(scrapAdded(QUrl,QRect,QPoint)), SLOT(addScrap(QUrl, QRect, QPoint)));
-    connect(m_webView, SIGNAL(scrapAdded(QUrl,QRect,QPoint)), SLOT(showScraps()));
+    connect(m_webView, SIGNAL(scrapAdded(QUrl,QSize,QRect,QPoint)), SLOT(addScrap(QUrl, QSize, QRect, QPoint)));
+    connect(m_webView, SIGNAL(scrapAdded(QUrl,QSize,QRect,QPoint)), SLOT(showScraps()));
     createBrowserToolbar(scene());
     m_browserToolbar->setFillLevelBrush(QColor(50, 50, 200, 50));
     connect(m_webView->page(), SIGNAL(loadProgress(int)), m_browserToolbar, SLOT(setFillLevel(int)));
@@ -343,6 +344,7 @@ void MainWindow::saveSettings() {
             scrap = container->webScrap();
         if (scrap) {
             m_settings->setValue("url", scrap->url().toString());
+            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();
@@ -371,16 +373,17 @@ void MainWindow::loadSettings() {
             QRect scrapRect;
             scrapRect.setTopLeft(m_settings->value("topLeft").toPoint());
             scrapRect.setSize(m_settings->value("size").toSize());
+            QSize pageSize = m_settings->value("pageSize", QSize(800, 600)).toSize();
             QPoint pos = m_settings->value("pos").toPoint();
             qreal xScale = m_settings->value("xScale", 1.0).toReal();
             qreal yScale = m_settings->value("yScale", 1.0).toReal();
             int refreshMins = m_settings->value("refresh_m", 60).toInt();
-            addScrap(url, scrapRect, pos, xScale, yScale, refreshMins);
+            addScrap(url, pageSize, scrapRect, pos, xScale, yScale, refreshMins);
         }
     } else {
-        addScrap(QUrl("http://www.gocomics.com/calvinandhobbes/"),
+        addScrap(QUrl("http://www.gocomics.com/calvinandhobbes/"), QSize(800, 600),
                  QRect(30, 299, 600, 201), QPoint(12, 115));
-        addScrap(QUrl("http://dilbert.com/"),
+        addScrap(QUrl("http://dilbert.com/"),  QSize(800, 600),
                  QRect(20, 197, 640, 199), QPoint(12, 362));
         m_scrapsToolbar->setPos(325, 5);
         m_browserToolbar->setPos(325, 5);