summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-08-15 20:28:00 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-08-15 20:56:39 +0200
commit594dab88cb7f143f75df356cde47f6022e8e1ee2 (patch)
treefed6f1e78841cfe6cfa84b398fcd6bbae4fc68aa /kde-frameworks
parentkde-frameworks/plasma: Fix pinned calendar showing wrong no. of dots (diff)
downloadgentoo-594dab88cb7f143f75df356cde47f6022e8e1ee2.tar.gz
gentoo-594dab88cb7f143f75df356cde47f6022e8e1ee2.tar.bz2
gentoo-594dab88cb7f143f75df356cde47f6022e8e1ee2.zip
kde-frameworks/kio: KDirOperator: exp. to url only in detail treeview
Upstream commit 51737430fcd963a04a4eddbb166114ae25430814 KDE-bug: https://bugs.kde.org/show_bug.cgi?id=440475 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks')
-rw-r--r--kde-frameworks/kio/files/kio-5.85.0-KDirOperator-exp-to-url-only-in-detail-treeview.patch54
-rw-r--r--kde-frameworks/kio/kio-5.85.0-r1.ebuild (renamed from kde-frameworks/kio/kio-5.85.0.ebuild)4
2 files changed, 58 insertions, 0 deletions
diff --git a/kde-frameworks/kio/files/kio-5.85.0-KDirOperator-exp-to-url-only-in-detail-treeview.patch b/kde-frameworks/kio/files/kio-5.85.0-KDirOperator-exp-to-url-only-in-detail-treeview.patch
new file mode 100644
index 00000000000..54365b694fa
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.85.0-KDirOperator-exp-to-url-only-in-detail-treeview.patch
@@ -0,0 +1,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
+
diff --git a/kde-frameworks/kio/kio-5.85.0.ebuild b/kde-frameworks/kio/kio-5.85.0-r1.ebuild
index 2d2d3499281..9522606997f 100644
--- a/kde-frameworks/kio/kio-5.85.0.ebuild
+++ b/kde-frameworks/kio/kio-5.85.0-r1.ebuild
@@ -71,6 +71,10 @@ DEPEND="${RDEPEND}
"
PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
+PATCHES=(
+ "${FILESDIR}"/${P}-KDirOperator-exp-to-url-only-in-detail-treeview.patch # KDE-bug 440475
+)
+
src_configure() {
local mycmakeargs=(
-DKIO_NO_PUBLIC_QTCONCURRENT=ON