Wait longer, before restoring previous reading position, after

orientation change.

diff --git a/adopterwindow.cpp b/adopterwindow.cpp
index daafa29..5be356d 100644 (file)
--- a/adopterwindow.cpp
+++ b/adopterwindow.cpp
@@ -146,7 +146,7 @@ void AdopterWindow::resizeEvent(QResizeEvent *event)
 #if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
     // Restore previous reading position
     if (bookView) {
-        QTimer::singleShot(110, bookView, SLOT(restoreLastBookmark()));
+        QTimer::singleShot(230, bookView, SLOT(restoreLastBookmark()));
     }
 #endif // defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
 }

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 2aa7abe..f4ebc2a 100755 (executable)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -188,6 +188,7 @@ void MainWindow::showRegular()
 
     fullScreenWindow->hide();
     show();
+    view->restoreLastBookmark();
 }
 
 void MainWindow::showBig()
@@ -204,6 +205,7 @@ void MainWindow::showBig()
     hide();
 #endif
     fullScreenWindow->showFullScreen();
+    view->restoreLastBookmark();
 }
 
 void MainWindow::setCurrentBook(const QModelIndex &current)
@@ -229,6 +231,7 @@ void MainWindow::rotate()
     QString current = Settings::instance()->value("orientation",
         Platform::instance()->defaultOrientation()).toString();
     QString target = (current == "landscape")? "portrait": "landscape";
+    view->setLastBookmark();
     Settings::instance()->setValue("orientation", target);
 }
 
@@ -256,7 +259,6 @@ void MainWindow::onSettingsChanged(const QString &key)
     qDebug() << "Key" << key;
 
     if (key == "orientation") {
-        view->setLastBookmark();
         QString value = Settings::instance()->value(key,
             Platform::instance()->defaultOrientation()).toString();
         qDebug() << "Value: orientation" << value;

diff --git a/model/book.cpp b/model/book.cpp
index 8aa4022..7516665 100644 (file)
--- a/model/book.cpp
+++ b/model/book.cpp
@@ -339,6 +339,7 @@ void Book::save()
 void Book::setLastBookmark(int part, qreal position, bool fast)
 {
     TRACE;
+    qDebug() << "Part" << part << "position" << position << "fast?" << fast;
     if (!fast) {
         load();
     }