diff options
| author | Peter Penz <[email protected]> | 2012-01-06 18:00:07 +0100 |
|---|---|---|
| committer | Peter Penz <[email protected]> | 2012-01-06 18:03:15 +0100 |
| commit | 636292bfcb51255b69667ede0f15b77de20149d2 (patch) | |
| tree | db3ddd379698f62e84d66f7180686075252350df | |
| parent | 642f2804cd452a9aa1465a3a585c1aae0ed4fb14 (diff) | |
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
| -rw-r--r-- | src/kitemviews/kfileitemmodel.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
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); } } |
