X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=adopterwindow.cpp;h=173ed8b6b36d59ee038d831e312a2955fbdf4265;hb=4f46de1a517b4d92eed3debb8f3f7012c51a5653;hp=735d37cc54a16fbaed224398c731abcb5e12dab4;hpb=a477146d205b88aa0e3422028f3b9b81fc60c7ec;p=dorian diff --git a/adopterwindow.cpp b/adopterwindow.cpp index 735d37c..173ed8b 100644 --- a/adopterwindow.cpp +++ b/adopterwindow.cpp @@ -137,15 +137,30 @@ void AdopterWindow::resizeEvent(QResizeEvent *event) Trace t("AdopterWindow::resizeEvent"); MainBase::resizeEvent(event); placeDecorations(); + #if defined(Q_WS_MAEMO_5) - if (bookView) { - QTimer::singleShot(110, bookView, SLOT(restoreLastBookmark())); + // Restore previous reading position + if (!bookView) { + return; } -#elif defined(Q_OS_SYMBIAN) - if (bookView) { - QTimer::singleShot(1000, bookView, SLOT(adjustPosition())); + QTimer::singleShot(110, bookView, SLOT(restoreLastBookmark())); +#endif // Q_WS_MAEMO_5 + +#if defined(Q_OS_SYMBIAN) + // Adjust reading position after orientation change + if (!bookView) { + return; } -#endif + if (event->oldSize().width() == -1) { + return; + } + bool oldPortrait = event->oldSize().width() < event->oldSize().height(); + bool portrait = event->size().width() < event->size().height(); + if (oldPortrait == portrait) { + return; + } + QTimer::singleShot(990, bookView, SLOT(adjustPosition())); +#endif // Q_OS_SYMBIAN } void AdopterWindow::closeEvent(QCloseEvent *event)