void KItemListSelectionManager::setCurrentItem(int current)
{
const int previous = m_currentItem;
+ const QSet<int> previousSelection = selectedItems();
+
if (m_model && current >= 0 && current < m_model->count()) {
m_currentItem = current;
} else {
if (m_currentItem != previous) {
emit currentChanged(m_currentItem, previous);
+
+ if (m_isAnchoredSelectionActive) {
+ const QSet<int> selection = selectedItems();
+ if (selection != previousSelection) {
+ emit selectionChanged(selection, previousSelection);
+ }
+ }
}
}
{
QSet<int> selectedItems = m_selectedItems;
- if (m_isAnchoredSelectionActive) {
+ if (m_isAnchoredSelectionActive && m_anchorItem != m_currentItem) {
+ Q_ASSERT(m_anchorItem >= 0);
+ Q_ASSERT(m_currentItem >= 0);
const int from = qMin(m_anchorItem, m_currentItem);
const int to = qMax(m_anchorItem, m_currentItem);
- for (int index = from; index <= to; index++) {
+ for (int index = from; index <= to; ++index) {
selectedItems.insert(index);
}
}
bool KItemListSelectionManager::hasSelection() const
{
- return !m_selectedItems.isEmpty() || m_isAnchoredSelectionActive;
+ return !m_selectedItems.isEmpty() || (m_isAnchoredSelectionActive && m_anchorItem != m_currentItem);
}
void KItemListSelectionManager::setSelected(int index, int count, SelectionMode mode)
return;
}
- const QSet<int> previous = m_selectedItems;
+ endAnchoredSelection();
+ const QSet<int> previous = selectedItems();
count = qMin(count, m_model->count() - index);
break;
}
- if (m_selectedItems != previous) {
- emit selectionChanged(m_selectedItems, previous);
+ const QSet<int> selection = selectedItems();
+ if (selection != previous) {
+ emit selectionChanged(selection, previous);
}
}
void KItemListSelectionManager::clearSelection()
{
- if (!m_selectedItems.isEmpty()) {
- const QSet<int> previous = m_selectedItems;
+ const QSet<int> previous = selectedItems();
+ if (!previous.isEmpty()) {
m_selectedItems.clear();
m_isAnchoredSelectionActive = false;
- emit selectionChanged(m_selectedItems, previous);
- }
- else if (m_isAnchoredSelectionActive) {
- m_isAnchoredSelectionActive = false;
- // TODO: the 'previous' parameter of the signal has to be set correctly, but do we actually need it?
- emit selectionChanged(m_selectedItems, m_selectedItems);
+ emit selectionChanged(QSet<int>(), previous);
}
}
void KItemListSelectionManager::beginAnchoredSelection(int anchor)
{
- m_isAnchoredSelectionActive = true;
- setAnchorItem(anchor);
+ if (anchor >= 0 && m_model && anchor < m_model->count()) {
+ m_isAnchoredSelectionActive = true;
+ m_anchorItem = anchor;
+ }
}
void KItemListSelectionManager::endAnchoredSelection()
{
- if (m_isAnchoredSelectionActive) {
+ if (m_isAnchoredSelectionActive && (m_anchorItem != m_currentItem)) {
+ Q_ASSERT(m_anchorItem >= 0);
+ Q_ASSERT(m_currentItem >= 0);
const int from = qMin(m_anchorItem, m_currentItem);
const int to = qMax(m_anchorItem, m_currentItem);
- for (int index = from; index <= to; index++) {
+ for (int index = from; index <= to; ++index) {
m_selectedItems.insert(index);
}
-
- m_isAnchoredSelectionActive = false;
}
-}
-void KItemListSelectionManager::setAnchorItem(int anchor)
-{
- const int previous = m_anchorItem;
- if (m_model && anchor < m_model->count()) {
- m_anchorItem = anchor;
- } else {
- m_anchorItem = -1;
- }
-
- if (m_anchorItem != previous) {
- emit anchorChanged(m_anchorItem, previous);
- }
+ m_isAnchoredSelectionActive = false;
}
int KItemListSelectionManager::anchorItem() const
return m_isAnchoredSelectionActive;
}
-void KItemListSelectionManager::setAnchoredSelectionActive(bool active)
-{
- m_isAnchoredSelectionActive = active;
-}
-
KItemModelBase* KItemListSelectionManager::model() const
{
return m_model;
void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges)
{
+ // Store the current selection (needed in the selectionChanged() signal)
+ const QSet<int> previousSelection = selectedItems();
+
// Update the current item
if (m_currentItem < 0) {
setCurrentItem(0);
} else {
+ const int previousCurrent = m_currentItem;
int inc = 0;
foreach (const KItemRange& itemRange, itemRanges) {
if (m_currentItem < itemRange.index) {
}
inc += itemRange.count;
}
- setCurrentItem(m_currentItem + inc);
+ // 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 += inc;
+ emit currentChanged(m_currentItem, previousCurrent);
}
// Update the anchor item
if (m_anchorItem < 0) {
- setAnchorItem(0);
+ m_anchorItem = 0;
} else {
int inc = 0;
foreach (const KItemRange& itemRange, itemRanges) {
}
inc += itemRange.count;
}
- setAnchorItem(m_anchorItem + inc);
+ m_anchorItem += inc;
}
// Update the selections
if (!m_selectedItems.isEmpty()) {
const QSet<int> previous = m_selectedItems;
-
- QSet<int> current;
- current.reserve(m_selectedItems.count());
- QSetIterator<int> it(m_selectedItems);
+ m_selectedItems.clear();
+ QSetIterator<int> it(previous);
while (it.hasNext()) {
const int index = it.next();
int inc = 0;
}
inc += itemRange.count;
}
- current.insert(index + inc);
+ m_selectedItems.insert(index + inc);
}
+ }
- if (current != previous) {
- m_selectedItems = current;
- emit selectionChanged(current, previous);
- }
+ const QSet<int> selection = selectedItems();
+ if (selection != previousSelection) {
+ emit selectionChanged(selection, previousSelection);
}
}
void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges)
{
+ // Store the current selection (needed in the selectionChanged() signal)
+ const QSet<int> previousSelection = selectedItems();
+
// Update the current item
if (m_currentItem >= 0) {
+ const int previousCurrent = m_currentItem;
int currentItem = m_currentItem;
foreach (const KItemRange& itemRange, itemRanges) {
if (currentItem < itemRange.index) {
currentItem = m_model->count() - 1;
}
}
- setCurrentItem(currentItem);
+ // 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 = currentItem;
+ emit currentChanged(m_currentItem, previousCurrent);
}
// Update the anchor item
anchorItem = m_model->count() - 1;
}
}
- setAnchorItem(anchorItem);
+ m_anchorItem = anchorItem;
+ if (m_anchorItem < 0) {
+ m_isAnchoredSelectionActive = false;
+ }
}
// Update the selections
if (!m_selectedItems.isEmpty()) {
const QSet<int> previous = m_selectedItems;
-
- QSet<int> current;
- current.reserve(m_selectedItems.count());
- QSetIterator<int> it(m_selectedItems);
+ m_selectedItems.clear();
+ QSetIterator<int> it(previous);
while (it.hasNext()) {
int index = it.next();
int dec = 0;
}
index -= dec;
if (index >= 0) {
- current.insert(index);
+ m_selectedItems.insert(index);
}
}
+ }
- if (current != previous) {
- m_selectedItems = current;
- emit selectionChanged(current, previous);
- }
+ const QSet<int> selection = selectedItems();
+ if (selection != previousSelection) {
+ emit selectionChanged(selection, previousSelection);
}
}
projects / dolphin.git / blobdiff