From: Peter Penz <peter.penz19@gmail.com>
Date: Fri, 6 Jan 2012 17:00:07 +0000 (+0100)
Subject: Details view: Fix wrong expansion level
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/21f49d84eb4b26d7b628ad17395e5445dc77f167

Details view: Fix wrong expansion level

The calculation of the root-expansion level had been incorrect which
lead to a wrong indentation on some directories.

BUG: 290757
FIXED-IN: 4.8.0
---

diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index 4893313eb..d81ddd965 100644
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -1188,12 +1188,8 @@ QHash<QByteArray, QVariant> KFileItemModel::retrieveData(const KFileItem& item)
             if (forceRootExpansionLevel) {
                 m_rootExpansionLevel = ForceRootExpansionLevel;
             } else {
-                const QString rootDir = rootUrl.directory(KUrl::AppendTrailingSlash);
+                const QString rootDir = rootUrl.path(KUrl::AddTrailingSlash);
                 m_rootExpansionLevel = rootDir.count('/');
-                if (m_rootExpansionLevel == 1) {
-                    // Special case: The root is already reached and no parent is available
-                    --m_rootExpansionLevel;
-                }
             }
         }
 
@@ -1201,7 +1197,7 @@ QHash<QByteArray, QVariant> KFileItemModel::retrieveData(const KFileItem& item)
             data.insert("expansionLevel", -1);
         } else {
             const QString dir = item.url().directory(KUrl::AppendTrailingSlash);
-            const int level = dir.count('/') - m_rootExpansionLevel - 1;
+            const int level = dir.count('/') - m_rootExpansionLevel;
             data.insert("expansionLevel", level);
         }
     }