blob: 54365b694fa60bdfa87d5a600cc19575b019e332 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
From 51737430fcd963a04a4eddbb166114ae25430814 Mon Sep 17 00:00:00 2001
From: Ahmad Samir <a.samirh78@gmail.com>
Date: Wed, 4 Aug 2021 23:22:10 +0200
Subject: [PATCH] KDirOperator: expand to url only in detail tree view
When "allow expansion" is disabled in the menu, the view type is KFile::Tree,
however when selecting an item from the location (Name:) combobox history,
the item model would expand to show the file; that should only happen if
"allow expansion" is enabled, i.e. when the view type is KFile::DetailTree.
BUG: 440475
FIXED-IN: 5.86
asturm 2021-08-15: fixed by merge with 8039f8b399757001ffa919ef56ede283c287dcd4
---
src/filewidgets/kdiroperator.cpp | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/filewidgets/kdiroperator.cpp b/src/filewidgets/kdiroperator.cpp
index bc80d93fe..7af20a057 100644
--- a/src/filewidgets/kdiroperator.cpp
+++ b/src/filewidgets/kdiroperator.cpp
@@ -1870,7 +1870,11 @@ void KDirOperator::setCurrentItem(const QUrl &url)
KFileItem item = d->m_dirLister->findByUrl(url);
if (d->m_shouldFetchForItems && item.isNull()) {
d->m_itemsToBeSetAsCurrent << url;
- d->m_dirModel->expandToUrl(url);
+
+ if (d->m_viewKind == KFile::DetailTree) {
+ d->m_dirModel->expandToUrl(url);
+ }
+
return;
}
@@ -1909,9 +1913,14 @@ void KDirOperator::setCurrentItems(const QList<QUrl> &urls)
KFileItem item = d->m_dirLister->findByUrl(url);
if (d->m_shouldFetchForItems && item.isNull()) {
d->m_itemsToBeSetAsCurrent << url;
- d->m_dirModel->expandToUrl(url);
+
+ if (d->m_viewKind == KFile::DetailTree) {
+ d->m_dirModel->expandToUrl(url);
+ }
+
continue;
}
+
itemList << item;
}
--
GitLab
|
