mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-19 16:31:21 +00:00
When the current item is removed, make -1 the current index temporarily
This fixes two problems: 1. KItemListKeyboardSearchManger can cancel the current search when a new folder is opened (note that this action removes the current item from the view). 2. The view can underline the new current item (which is the item that used to be below the removed item). Note that this did not work before because the view did not receive a currentChanged() signal in this case and therefore did not update the "current item" status of the new current item. BUG: 297488 BUG: 298782 FIXED-IN: 4.8.3 REVIEW: 104709
This commit is contained in:
parent
d3b1312d3e
commit
68ce395a19
|
@ -59,6 +59,8 @@ KItemListController::KItemListController(QObject* parent) :
|
|||
{
|
||||
connect(m_keyboardManager, SIGNAL(changeCurrentItem(QString,bool)),
|
||||
this, SLOT(slotChangeCurrentItem(QString,bool)));
|
||||
connect(m_selectionManager, SIGNAL(currentChanged(int,int)),
|
||||
m_keyboardManager, SLOT(slotCurrentChanged(int,int)));
|
||||
|
||||
m_autoActivationTimer = new QTimer(this);
|
||||
m_autoActivationTimer->setSingleShot(true);
|
||||
|
|
|
@ -78,3 +78,13 @@ void KItemListKeyboardSearchManager::cancelSearch()
|
|||
{
|
||||
m_searchedString.clear();
|
||||
}
|
||||
|
||||
void KItemListKeyboardSearchManager::slotCurrentChanged(int current, int previous)
|
||||
{
|
||||
Q_UNUSED(previous);
|
||||
|
||||
if (current < 0) {
|
||||
// The current item has been removed. We should cancel the search.
|
||||
cancelSearch();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -60,6 +60,10 @@ public:
|
|||
|
||||
void cancelSearch();
|
||||
|
||||
public slots:
|
||||
|
||||
void slotCurrentChanged(int current, int previous);
|
||||
|
||||
signals:
|
||||
/**
|
||||
* Is emitted if the current item should be changed corresponding
|
||||
|
|
|
@ -291,12 +291,15 @@ void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges)
|
|||
// Calling setCurrentItem() would trigger the selectionChanged signal, but we want to
|
||||
// emit it only once in this function -> change the current item manually and emit currentChanged
|
||||
m_currentItem = indexAfterRangesRemoving(m_currentItem, itemRanges);
|
||||
if (m_currentItem < 0) {
|
||||
m_currentItem = qMin(previousCurrent, m_model->count() - 1);
|
||||
}
|
||||
if (m_currentItem != previousCurrent) {
|
||||
emit currentChanged(m_currentItem, previousCurrent);
|
||||
}
|
||||
|
||||
if (m_currentItem < 0) {
|
||||
// The current item has been removed.
|
||||
m_currentItem = qMin(previousCurrent, m_model->count() - 1);
|
||||
emit currentChanged(m_currentItem, -1);
|
||||
}
|
||||
}
|
||||
|
||||
// Update the anchor item
|
||||
|
|
Loading…
Reference in a new issue