Merge pull request #1350 from Holt59/collapsible-separators

Collapsible separators - Fix & Improvements.

1 files changed, 3 insertions, 13 deletions

diff --git a/src/genericicondelegate.cpp b/src/genericicondelegate.cpp
index 1e00f0e9..7afaca3f 100644
--- a/src/genericicondelegate.cpp
+++ b/src/genericicondelegate.cpp
@@ -4,28 +4,18 @@
 #include <QPixmapCache>

 

 

-GenericIconDelegate::GenericIconDelegate(QObject *parent, int role, int logicalIndex, int compactSize)

-  : IconDelegate(parent)

+GenericIconDelegate::GenericIconDelegate(QTreeView* parent, int role, int logicalIndex, int compactSize)

+  : IconDelegate(parent, logicalIndex, compactSize)

   , m_Role(role)

-  , m_LogicalIndex(logicalIndex)

-  , m_CompactSize(compactSize)

-  , m_Compact(false)

 {

 }

 

-void GenericIconDelegate::columnResized(int logicalIndex, int, int newSize)

-{

-  if (logicalIndex == m_LogicalIndex) {

-    m_Compact = newSize < m_CompactSize;

-  }

-}

-

 QList<QString> GenericIconDelegate::getIcons(const QModelIndex &index) const

 {

   QList<QString> result;

   if (index.isValid()) {

     for (const QVariant &var : index.data(m_Role).toList()) {

-      if (!m_Compact || !var.toString().isEmpty()) {

+      if (!compact() || !var.toString().isEmpty()) {

         result.append(var.toString());

       }

     }