put the thumbnail setting into PageItem as bookkeeping is helpful here

This commit is contained in:
Aaron Seigo 2012-10-07 21:07:38 +02:00
parent 973e9a28b8
commit 863e34dc7a
3 changed files with 29 additions and 11 deletions

View file

@ -335,4 +335,22 @@ void PageItem::contentYChanged()
m_viewPort.rePos.normalizedY = m_flickable.data()->property("contentY").toReal();
}
void PageItem::setIsThumbnail(bool thumbnail)
{
if (thumbnail == (m_observerId == THUMBNAILS_ID)) {
return;
}
m_observerId = thumbnail ? THUMBNAILS_ID : PAGEVIEW_ID;
if (thumbnail) {
m_smooth = false;
}
/*
m_redrawTimer->setInterval(thumbnail ? 0 : REDRAW_TIMEOUT);
m_redrawTimer->setSingleShot(true);
*/
}
#include "pageitem.moc"

View file

@ -129,13 +129,6 @@ public:
void geometryChanged(const QRectF &newGeometry,
const QRectF &oldGeometry);
private Q_SLOTS:
void delayedRedraw();
void pageHasChanged(int page, int flags);
void checkBookmarksChanged();
void contentXChanged();
void contentYChanged();
Q_SIGNALS:
void flickableChanged();
void implicitWidthChanged();
@ -145,6 +138,16 @@ Q_SIGNALS:
void bookmarkedChanged();
void bookmarksChanged();
protected:
void setIsThumbnail(bool thumbnail);
private Q_SLOTS:
void delayedRedraw();
void pageHasChanged(int page, int flags);
void checkBookmarksChanged();
void contentXChanged();
void contentYChanged();
private:
const Okular::Page *m_page;
bool m_smooth;
@ -155,7 +158,6 @@ private:
int m_observerId;
QWeakPointer <QDeclarativeItem> m_flickable;
Okular::DocumentViewport m_viewPort;
friend class ThumbnailItem;
};
#endif

View file

@ -19,12 +19,10 @@
#include "thumbnailitem.h"
#include <core/observer.h>
ThumbnailItem::ThumbnailItem(QDeclarativeItem *parent)
: PageItem(parent)
{
m_observerId = THUMBNAILS_ID;
setIsThumbnail(true);
}