スレッド処理を整理

[gefu/Gefu.git] / thumbnaildelegate.cpp

diff --git a/thumbnaildelegate.cpp b/thumbnaildelegate.cpp
index 17ae692..99eaf85 100644 (file)
--- a/thumbnaildelegate.cpp
+++ b/thumbnaildelegate.cpp
@@ -7,18 +7,10 @@
 #include <QStylePainter>
 
 ThumbnailDelegate::ThumbnailDelegate(QObject *parent) :
-    QStyledItemDelegate(parent),
-    m_pixmapCache()
+    QStyledItemDelegate(parent)
 {
 }
 
-void ThumbnailDelegate::model_Reset()
-{
-    qDebug() << "ThumbnailDelegate::model_Reset()";
-
-    m_pixmapCache.clear();
-}
-
 void ThumbnailDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
     const FolderModel *model = static_cast<const FolderModel*>(index.model());
@@ -55,13 +47,11 @@ void ThumbnailDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opt
     }
 
     // アイコンまたは画像
-    QSize size(option.rect.size());
-    size -= padding;
+    QSize size(option.rect.size() - padding);
     QPixmap pixmap = model->pixmap(index, size);
     painter->drawPixmap(padding.width() + option.rect.left() + (size.width() - pixmap.width()) / 2,
                         option.rect.top() + (size.height() - pixmap.height()) / 2,
                         pixmap);
-
 }
 
 QSize ThumbnailDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
@@ -71,5 +61,5 @@ QSize ThumbnailDelegate::sizeHint(const QStyleOptionViewItem &option, const QMod
     const FolderModel *model = static_cast<const FolderModel*>(index.model());
     int pointSize = model->data(index, Qt::FontRole).value<QFont>().pointSize();
 
-    return QSize(pointSize * 10, pointSize * 10 * 3 / 4);
+    return QSize(pointSize * 10, pointSize * 10 * 3 / 4) * m_scaleFactor;
 }