From: Peter Penz <peter.penz19@gmail.com>
Date: Sun, 6 Nov 2011 22:09:46 +0000 (+0100)
Subject: Fix expansion-level issue
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/c4e3528c7a514c11d77315769887dcbb2d9c933c

Fix expansion-level issue

When the details-view has been used on / a wrong expansion-level
has been calculated and hence no expansion-toggles have been
visible.
---

diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index c0c442e23..d46bfc8da 100644
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -961,11 +961,12 @@ QHash<QByteArray, QVariant> KFileItemModel::retrieveData(const KFileItem& item)
     }
 
     if (m_requestRole[ExpansionLevelRole]) {
-        if (m_rootExpansionLevel < 0) {
-            KDirLister* dirLister = m_dirLister.data();
-            if (dirLister) {
-                const QString rootDir = dirLister->url().directory(KUrl::AppendTrailingSlash);
-                m_rootExpansionLevel = rootDir.count('/');
+        if (m_rootExpansionLevel < 0 && m_dirLister.data()) {
+            const QString rootDir = m_dirLister.data()->url().directory(KUrl::AppendTrailingSlash);
+            m_rootExpansionLevel = rootDir.count('/');
+            if (m_rootExpansionLevel == 1) {
+                // Special case: The root is already reached and no parent is available
+                --m_rootExpansionLevel;
             }
         }
         const QString dir = item.url().directory(KUrl::AppendTrailingSlash);