┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Penz <[email protected]>2012-01-06 18:00:07 +0100
committerPeter Penz <[email protected]>2012-01-06 18:02:36 +0100
commit21f49d84eb4b26d7b628ad17395e5445dc77f167 (patch)
treec8d7dc050a5719200f89aa2499d4f2be3c9176ef
parent961fdf1a1c878f226309d8a32d94a27babba687c (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.cpp8
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);
}
}