Don't show an expansion toggle for locked expansions

diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp
index 13832a80bc3fb211a2fd866c29b13250e5b0a0b7..7fce4b74ddbf8517ebbe4b93aa869c98c67353fe 100644 (file)
--- a/src/kitemviews/kfileitemlistwidget.cpp
+++ b/src/kitemviews/kfileitemlistwidget.cpp
@@ -424,15 +424,17 @@ void KFileItemListWidget::updateExpansionArea()
         Q_ASSERT(values.contains("expansionLevel"));
         const KItemListStyleOption& option = styleOption();
         const int expansionLevel = values.value("expansionLevel", 0).toInt();
         Q_ASSERT(values.contains("expansionLevel"));
         const KItemListStyleOption& option = styleOption();
         const int expansionLevel = values.value("expansionLevel", 0).toInt();

-
-        const qreal widgetHeight = size().height();
-        const qreal expansionLevelSize = KIconLoader::SizeSmall;
-        const qreal x = option.margin + expansionLevel * widgetHeight;
-        const qreal y = (widgetHeight - expansionLevelSize) / 2;
-        m_expansionArea = QRectF(x, y, expansionLevelSize, expansionLevelSize);
-    } else {
-        m_expansionArea = QRectF();
+        if (expansionLevel >= 0) {
+            const qreal widgetHeight = size().height();
+            const qreal expansionLevelSize = KIconLoader::SizeSmall;
+            const qreal x = option.margin + expansionLevel * widgetHeight;
+            const qreal y = (widgetHeight - expansionLevelSize) / 2;
+            m_expansionArea = QRectF(x, y, expansionLevelSize, expansionLevelSize);
+            return;
+        }

     }
     }

+
+    m_expansionArea = QRectF();

 }
 
 void KFileItemListWidget::updatePixmapCache()
 }
 
 void KFileItemListWidget::updatePixmapCache()

diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index ed45e69754d8572aa07b2d5bfc489192f8070587..04e3c8ca7c378a60efcdff29add2683705d98d7e 100644 (file)
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -1158,7 +1158,7 @@ QHash<QByteArray, QVariant> KFileItemModel::retrieveData(const KFileItem& item)
         }
 
         if (m_rootExpansionLevel == ForceRootExpansionLevel) {
         }
 
         if (m_rootExpansionLevel == ForceRootExpansionLevel) {

-            data.insert("expansionLevel", 0);
+            data.insert("expansionLevel", -1);

         } else {
             const QString dir = item.url().directory(KUrl::AppendTrailingSlash);
             const int level = dir.count('/') - m_rootExpansionLevel - 1;
         } else {
             const QString dir = item.url().directory(KUrl::AppendTrailingSlash);
             const int level = dir.count('/') - m_rootExpansionLevel - 1;