Ticket #205: fileicons.diff

src/plugins/coreplugin/fileiconprovider.cpp

@@ -159 +159 @@
 {
     QPixmap iconPixmap = qApp->style()->standardIcon(baseIcon).pixmap(size);
     QPainter painter(&iconPixmap);
-    painter.drawPixmap(0, 0, overlayIcon.pixmap(size));
+    QPixmap overlayPixmap = overlayIcon.pixmap(size);
+    painter.drawPixmap((size.width() - overlayPixmap.width()) / 2,
+                       (size.height() - overlayPixmap.height()) / 2, overlayPixmap);
     painter.end();
     return iconPixmap;
 }
@@ -178 +180 @@
 
     QTC_ASSERT(!icon.isNull() && !suffix.isEmpty(), return)
 
-    const QPixmap fileIconPixmap = overlayIcon(QStyle::SP_FileIcon, icon, QSize(16, 16));
+    const QPixmap fileIconPixmap = overlayIcon(QStyle::SP_FileIcon, icon, iconSize());
     // replace old icon, if it exists
     const CacheIterator it = findBySuffix(suffix, d->m_cache.begin(), d->m_cache.end());
     if (it == d->m_cache.end()) {
@@ -208 +210 @@
     return FileIconProviderPrivate::m_instance;
 }
 
+/*!
+  Returns the size of a small icon
+  */
+
+QSize FileIconProvider::iconSize()
+{
+    int s = qApp->style()->pixelMetric(QStyle::PM_SmallIconSize);
+    return QSize(s, s);
+}
+
 } // namespace core

src/plugins/coreplugin/fileiconprovider.h

@@ -69 +69 @@
 
     static FileIconProvider *instance();
 
+    static QSize iconSize();
+
 private:
     FileIconProviderPrivate *d;
 };

src/plugins/projectexplorer/foldernavigationwidget.cpp

@@ -149 +149 @@
 #endif
     m_fileSystemModel->setFilter(filters);
     m_filterModel->setSourceModel(m_fileSystemModel);
-    m_listView->setIconSize(QSize(16,16));
+    m_listView->setIconSize(Core::FileIconProvider::iconSize());
     m_listView->setModel(m_filterModel);
     m_listView->setFrameStyle(QFrame::NoFrame);