kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 01:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix renamed file reclaims focus

Browse source 
Summary:
After renaming a file and then selecting another file immediately the just selected file stays selected.

BUG: 388555

Test Plan:
Steps to reproduce:
$ mkdir /tmp/test
$ cd /tmp/test
$ touch a.tmp b.tmp
$ dolphin /tmp/test

In dolphin:
* select a.tmp
* <F2>
* type aaa
* select b.tmp immediately

Expected result:
* a.tmp renamed to aaa.tmp
* b.tmp stays selected, aaa.tmp stays unselected

Reviewers: ngraham, michaelh, #dolphin, elvisangelaccio

Reviewed By: ngraham, michaelh, #dolphin, elvisangelaccio

Subscribers: emateli, elvisangelaccio, #dolphin

Differential Revision: https://phabricator.kde.org/D9711
This commit is contained in:
Andreas Krutzler 2018-01-21 13:39:41 -07:00 committed by Nathaniel Graham
parent 6cf74d2fdd
commit bba44ae907
1 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/views/dolphinview.cpp
View file

@ -1356,17 +1356,21 @@ void DolphinView::updateViewState()
{
if (m_currentItemUrl != QUrl()) {
KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
const int currentIndex = m_model->index(m_currentItemUrl);
if (currentIndex != -1) {
selectionManager->setCurrentItem(currentIndex);
// scroll to current item and reset the state
if (m_scrollToCurrentItem) {
m_view->scrollToItem(currentIndex);
m_scrollToCurrentItem = false;
// if there is a selection already, leave it that way
if (!selectionManager->hasSelection()) {
const int currentIndex = m_model->index(m_currentItemUrl);
if (currentIndex != -1) {
selectionManager->setCurrentItem(currentIndex);
// scroll to current item and reset the state
if (m_scrollToCurrentItem) {
m_view->scrollToItem(currentIndex);
m_scrollToCurrentItem = false;
}
} else {
selectionManager->setCurrentItem(0);
}
} else {
selectionManager->setCurrentItem(0);
}
m_currentItemUrl = QUrl();
@ -1384,26 +1388,29 @@ void DolphinView::updateViewState()
if (!m_selectedUrls.isEmpty()) {
KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
if (m_clearSelectionBeforeSelectingNewItems) {
selectionManager->clearSelection();
m_clearSelectionBeforeSelectingNewItems = false;
}
KItemSet selectedItems = selectionManager->selectedItems();
QList<QUrl>::iterator it = m_selectedUrls.begin();
while (it != m_selectedUrls.end()) {
const int index = m_model->index(*it);
if (index >= 0) {
selectedItems.insert(index);
it = m_selectedUrls.erase(it);
} else {
++it;
// if there is a selection already, leave it that way
if (!selectionManager->hasSelection()) {
if (m_clearSelectionBeforeSelectingNewItems) {
selectionManager->clearSelection();
m_clearSelectionBeforeSelectingNewItems = false;
}
}
selectionManager->beginAnchoredSelection(selectionManager->currentItem());
selectionManager->setSelectedItems(selectedItems);
KItemSet selectedItems = selectionManager->selectedItems();
QList<QUrl>::iterator it = m_selectedUrls.begin();
while (it != m_selectedUrls.end()) {
const int index = m_model->index(*it);
if (index >= 0) {
selectedItems.insert(index);
it = m_selectedUrls.erase(it);
} else {
++it;
}
}
selectionManager->beginAnchoredSelection(selectionManager->currentItem());
selectionManager->setSelectedItems(selectedItems);
}
}
}