Commit 4f4e3d39 authored by Méven Car's avatar Méven Car
Browse files

PlacesPanel: activating a place does not select its previously selected children

BUG: 421347
parent 20848147
Pipeline #58393 passed with stage
in 4 minutes and 46 seconds
......@@ -1243,7 +1243,9 @@ void DolphinMainWindow::slotPlaceActivated(const QUrl& url)
// which had been unmounted earlier, see https://bugs.kde.org/show_bug.cgi?id=161385.
reloadView();
} else {
view->disableUrlNavigatorSelectionRequests();
changeUrl(url);
view->enableUrlNavigatorSelectionRequests();
}
}
......
......@@ -727,6 +727,18 @@ void DolphinViewContainer::slotUrlSelectionRequested(const QUrl& url)
m_view->markUrlAsCurrent(url); // makes the item scroll into view
}
void DolphinViewContainer::disableUrlNavigatorSelectionRequests()
{
disconnect(m_urlNavigator.get(), &KUrlNavigator::urlSelectionRequested,
this, &DolphinViewContainer::slotUrlSelectionRequested);
}
void DolphinViewContainer::enableUrlNavigatorSelectionRequests()
{
connect(m_urlNavigator.get(), &KUrlNavigator::urlSelectionRequested,
this, &DolphinViewContainer::slotUrlSelectionRequested);
}
void DolphinViewContainer::redirect(const QUrl& oldUrl, const QUrl& newUrl)
{
Q_UNUSED(oldUrl)
......
......@@ -174,6 +174,15 @@ public:
*/
QString caption() const;
/**
* Disable/enable the behavior of "select child when moving to parent folder"
* offered by KUrlNavigator.
*
* See KUrlNavigator::urlSelectionRequested
*/
void disableUrlNavigatorSelectionRequests();
void enableUrlNavigatorSelectionRequests();
public Q_SLOTS:
/**
* Sets the current active URL, where all actions are applied. The
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment