summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@theqtcompany.com>2014-12-16 01:37:36 +0100
committerShawn Rutledge <shawn.rutledge@theqtcompany.com>2014-12-16 01:40:37 +0100
commit188d4a072bdca8facad1b1e0670ed440050384ae (patch)
treea0b470a8ff120f87f00742ea7eda465e8fe4ca18
parent5e356dd6dc0779ffa3c7cae48eea664dcbca67b9 (diff)
pdfviewer example: QScroller makes kinetic flicking work
-rw-r--r--examples/widgets/pdfviewer/mainwindow.cpp3
-rw-r--r--examples/widgets/pdfviewer/sequentialpagewidget.cpp5
2 files changed, 3 insertions, 5 deletions
diff --git a/examples/widgets/pdfviewer/mainwindow.cpp b/examples/widgets/pdfviewer/mainwindow.cpp
index 71b35ef..f3fa000 100644
--- a/examples/widgets/pdfviewer/mainwindow.cpp
+++ b/examples/widgets/pdfviewer/mainwindow.cpp
@@ -4,6 +4,7 @@
#include <QFileDialog>
#include <QLineEdit>
#include <QMessageBox>
+#include <QScroller>
#include <QPdfDocument>
#include <QtMath>
#include "sequentialpagewidget.h"
@@ -33,6 +34,8 @@ MainWindow::MainWindow(QWidget *parent)
this, SLOT(zoomChanged(qreal)));
connect(m_zoomEdit, SIGNAL(returnPressed()), this, SLOT(zoomEdited()));
connect(m_pageEdit, SIGNAL(returnPressed()), this, SLOT(on_actionGo_triggered()));
+
+ QScroller::grabGesture(ui->scrollArea);
}
MainWindow::~MainWindow()
diff --git a/examples/widgets/pdfviewer/sequentialpagewidget.cpp b/examples/widgets/pdfviewer/sequentialpagewidget.cpp
index 2f4e3fb..c85f784 100644
--- a/examples/widgets/pdfviewer/sequentialpagewidget.cpp
+++ b/examples/widgets/pdfviewer/sequentialpagewidget.cpp
@@ -53,11 +53,8 @@ QSizeF SequentialPageWidget::pageSize(int page)
void SequentialPageWidget::invalidate()
{
QSizeF totalSize(0, m_pageSpacing);
-qDebug() << "pageCount" << pageCount();
-
for (int page = 0; page < pageCount(); ++page) {
QSizeF size = pageSize(page);
- qDebug() << "page" << page << "size" << size << "from" << m_pageSizes[page];
totalSize.setHeight(totalSize.height() + size.height());
if (size.width() > totalSize.width())
totalSize.setWidth(size.width());
@@ -103,8 +100,6 @@ void SequentialPageWidget::paintEvent(QPaintEvent * event)
y += m_pageSpacing;
m_topPageShowing = page;
-qDebug() << y << m_topPageShowing << pageCount();
-
// Actually render pages
while (y < event->rect().bottom() && page < pageCount()) {
QSizeF size = pageSize(page);