settings()->setAttribute(QWebSettings::PluginsEnabled, false);
settings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, true);
settings()->setAttribute(QWebSettings::JavascriptCanOpenWindows, false);
- settings()->setAttribute(QWebSettings::JavascriptCanAccessClipboard, false);
+ settings()->setAttribute(QWebSettings::JavascriptCanAccessClipboard,
+ false);
settings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled,
false);
settings()->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled,
frame->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
#endif
frame->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
- connect(this, SIGNAL(loadFinished(bool)), this, SLOT(onLoadFinished(bool)));
+ connect(this, SIGNAL(loadFinished(bool)),
+ this, SLOT(onLoadFinished(bool)));
connect(frame, SIGNAL(javaScriptWindowObjectCleared()),
this, SLOT(addJavaScriptObjects()));
}
}
-void BookView::setLastBookmark()
+void BookView::setLastBookmark(bool fast)
{
TRACE;
if (mBook) {
int pos = frame->scrollPosition().y();
qDebug() << QString("At %1 (%2%, height %3)").
arg(pos).arg((qreal)pos / (qreal)height * 100).arg(height);
- mBook->setLastBookmark(contentIndex, (qreal)pos / (qreal)height);
+ mBook->setLastBookmark(contentIndex, (qreal)pos / (qreal)height, fast);
}
}
int bookmarkPos = (int)((qreal)height * (qreal)b.pos);
painter.drawPixmap(2, bookmarkPos - scrollPos.y(), bookmarkPixmap);
}
+ if (mBook) {
+ QPen pen(Qt::gray);
+ pen.setStyle(Qt::DotLine);
+ pen.setWidth(3);
+ painter.setPen(pen);
+ if (contentIndex > 0) {
+ painter.drawLine(0, -scrollPos.y(), width(), -scrollPos.y());
+ }
+ if (contentIndex < (mBook->parts.size() - 1)) {
+ int h = contentsHeight - scrollPos.y() - 1;
+ painter.drawLine(0, h, width(), h);
+ }
+ }
}
void BookView::mousePressEvent(QMouseEvent *e)
if (scroller) {
scrollerMonitor = startTimer(500);
}
+#elif defined(Q_OS_SYMBIAN)
+ // Do nothing
#else
- // Handle mouse presses on the scroll bar
+ // Handle mouse press on the scroll bar
QWebFrame *frame = page()->mainFrame();
if (frame->scrollBarGeometry(Qt::Vertical).contains(e->pos())) {
e->accept();
return;
}
-#endif // Q_WS_MAEMO_5
+#endif
e->ignore();
}
// Work around Qt bug that sometimes selects web view contents during swipe
switch (e->type()) {
case QEvent::MouseButtonPress:
- emit suppressedMouseButtonPress();
mousePressed = true;
break;
case QEvent::MouseButtonRelease:
scrollerMonitor = -1;
}
}
-#endif
+#endif // Q_WS_MAEMO_5
+
QWebView::timerEvent(e);
}
{
QWebFrame *frame = page()->mainFrame();
int pos = frame->scrollPosition().y();
- frame->scroll(0, -height());
+ frame->scroll(0, -(height() - 19));
if (pos == frame->scrollPosition().y()) {
if (contentIndex > 0) {
Book::Bookmark bookmark(contentIndex - 1, 1.0);
TRACE;
QWebFrame *frame = page()->mainFrame();
int pos = frame->scrollPosition().y();
- frame->scroll(0, height());
+ frame->scroll(0, height() - 19);
if (pos == frame->scrollPosition().y()) {
goNext();
} else {
- // setLastBookmark();
showProgress();
}
}
}
#endif // Q_OS_SYMBIAN
+
+void BookView::adjustPosition(const QSize &size, const QSize &oldSize)
+{
+ if (mBook) {
+ QWebFrame *frame = page()->mainFrame();
+ int height = frame->contentsSize().height();
+ int pos = frame->scrollPosition().y();
+ qDebug() << QString("At %1 (%2%, height %3)").
+ arg(pos).arg((qreal)pos / (qreal)height * 100).arg(height);
+ }
+}