, itemCategorizer(0)
, mouseButtonPressed(false)
, isDragging(false)
+ , dragLeftViewport(false)
, proxyModel(0)
, lastIndex(QModelIndex())
{
}
}
- int j = 0;
for (int i = middle; i < proxyModel->rowCount(); i++)
{
index = elementDictionary[proxyModel->index(i, 0)];
// If we passed next item, stop searching for hits
if (qMax(rect.bottomRight().y(), rect.topLeft().y()) <
- indexVisualRect.topLeft().y())
+ qMin(indexVisualRect.topLeft().y(),
+ indexVisualRect.bottomRight().y()))
break;
-
- j++;
}
return intersectedIndexes;
opt.direction = option.direction;
opt.text = category;
- if (option.rect.contains(listView->viewport()->mapFromGlobal(QCursor::pos())) &&
- !mouseButtonPressed)
+ if ((category == hoveredCategory) && !mouseButtonPressed)
{
const QPalette::ColorGroup group =
option.state & QStyle::State_Enabled ?
{
QStyleOptionViewItemV3 option = listView->viewOptions();
option.state &= ~QStyle::State_MouseOver;
+ int dx;
+ int dy;
foreach (const QModelIndex &index, listView->selectionModel()->selectedIndexes())
{
- int dx = mousePosition.x() - initialPressPosition.x();
- int dy = mousePosition.y() - initialPressPosition.y();
+ dx = mousePosition.x() - initialPressPosition.x() + listView->horizontalOffset();
+ dy = mousePosition.y() - initialPressPosition.y() + listView->verticalOffset();
option.rect = visualRect(index);
option.rect.adjust(dx, dy, dx, dy);
d->elementDictionary.clear();
d->categoriesIndexes.clear();
d->categoriesPosition.clear();
- d->isIndexSelected.clear(); // selection cache
d->categories.clear();
d->intersectedIndexes.clear();
d->sourceModelIndexList.clear();
painter.restore();
}
- if (d->isDragging)
+ if (d->isDragging && !d->dragLeftViewport)
+ {
+ painter.setOpacity(0.5);
d->drawDraggedItems(&painter);
+ }
painter.restore();
}
return;
}
+ if (!flags)
+ return;
+
+ selectionModel()->clear();
+
if (flags & QItemSelectionModel::Clear)
{
- selectionModel()->clear();
- d->isIndexSelected.clear();
- d->isTemporarySelected.clear();
+ d->lastSelection = QItemSelection();
}
- QItemSelection selection;
QModelIndexList dirtyIndexes = d->intersectionSet(rect);
- foreach (const QModelIndex &index, dirtyIndexes)
+ QItemSelection selection;
+
+ if (!dirtyIndexes.count())
{
- if (!d->mouseButtonPressed && rect.intersects(visualRect(index)))
+ if (d->lastSelection.count())
{
- if (d->isIndexSelected.contains(index))
- {
- if (!d->isIndexSelected[index])
- selection.select(index, index);
-
- d->isIndexSelected[index] = true;
- }
- else
- {
- d->isIndexSelected.insert(index, true);
- selection.select(index, index);
- }
+ selectionModel()->select(d->lastSelection, flags);
}
- else if (d->mouseButtonPressed) // selection cache
- {
- if (!d->isIndexSelected.contains(index) ||
- (d->isIndexSelected.contains(index) && !d->isIndexSelected[index]))
- {
- if (d->isTemporarySelected.contains(index))
- {
- d->isTemporarySelected[index] = true;
- }
- else
- {
- d->isTemporarySelected.insert(index, true);
- }
- }
- if (d->isIndexSelected.contains(index))
- {
- if (!d->isIndexSelected[index])
- selection.select(index, index);
-
- d->isIndexSelected[index] = true;
- }
- else
- {
- d->isIndexSelected.insert(index, true);
- selection.select(index, index);
- }
- }
+ return;
}
- QItemSelection deselect;
-
- foreach (const QModelIndex &index, d->isIndexSelected.keys())
+ if (!d->mouseButtonPressed)
{
- if (!rect.intersects(visualRect(index)))
+ selection = QItemSelection(dirtyIndexes[0], dirtyIndexes[0]);
+ }
+ else
+ {
+ QModelIndex first = dirtyIndexes[0];
+ QModelIndex last;
+ foreach (const QModelIndex &index, dirtyIndexes)
{
- if (d->isTemporarySelected.contains(index) &&
- d->isTemporarySelected[index])
+ if (last.isValid() && last.row() + 1 != index.row())
{
- deselect.select(index, index);
- d->isTemporarySelected[index] = false;
- d->isIndexSelected[index] = false;
+ QItemSelectionRange range(first, last);
+
+ selection << range;
+
+ first = index;
}
+
+ last = index;
}
+
+ if (last.isValid())
+ selection << QItemSelectionRange(first, last);
}
- if (selection.count())
- selectionModel()->select(selection, QItemSelectionModel::Select);
+ if (d->lastSelection.count() && !d->mouseButtonPressed)
+ {
+ selection.merge(d->lastSelection, flags);
+ }
+ else if (d->lastSelection.count())
+ {
+ selection.merge(d->lastSelection, QItemSelectionModel::Select);
+ }
- if (deselect.count())
- selectionModel()->select(deselect, QItemSelectionModel::Deselect);
+ selectionModel()->select(selection, flags);
}
void KListView::mouseMoveEvent(QMouseEvent *event)
{
QListView::mouseMoveEvent(event);
- d->mousePosition = event->pos();
-
if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
!d->itemCategorizer)
{
return;
}
- event->accept();
+ d->mousePosition = event->pos();
+ d->hoveredCategory = QString();
+
+ // Redraw categories
+ foreach (const QString &category, d->categories)
+ {
+ if (d->categoryVisualRect(category).intersects(QRect(event->pos(), event->pos())))
+ {
+ d->hoveredCategory = category;
+ }
- viewport()->update();
+ viewport()->update(d->categoryVisualRect(category));
+ }
}
void KListView::mousePressEvent(QMouseEvent *event)
return;
}
- event->accept();
+ d->dragLeftViewport = false;
if (event->button() == Qt::LeftButton)
{
d->initialPressPosition.setX(d->initialPressPosition.x() +
horizontalOffset());
}
-
- viewport()->update();
}
void KListView::mouseReleaseEvent(QMouseEvent *event)
{
QListView::mouseReleaseEvent(event);
- d->mouseButtonPressed = false;
-
if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
!d->itemCategorizer)
{
return;
}
- event->accept();
-
- d->isTemporarySelected.clear(); // selection cache
+ d->mouseButtonPressed = false;
QPoint initialPressPosition = viewport()->mapFromGlobal(QCursor::pos());
initialPressPosition.setY(initialPressPosition.y() + verticalOffset());
initialPressPosition.setX(initialPressPosition.x() + horizontalOffset());
+ QItemSelection selection;
+
if (initialPressPosition == d->initialPressPosition)
{
- QItemSelection selection;
foreach(const QString &category, d->categories)
{
if (d->categoryVisualRect(category).contains(event->pos()))
{
- QModelIndex index;
- foreach (const QModelIndex &mappedIndex,
- d->categoriesIndexes[category])
- {
- index = d->proxyModel->mapFromSource(mappedIndex);
-
- if (d->isIndexSelected.contains(index))
- {
- if (!d->isIndexSelected[index])
- selection.select(index, index);
-
- d->isIndexSelected[index] = true;
- }
- else
- {
- d->isIndexSelected.insert(index, true);
- selection.select(index, index);
- }
- }
-
- selectionModel()->select(selection, QItemSelectionModel::Toggle);
+ QItemSelectionRange selectionRange(d->proxyModel->mapFromSource(d->categoriesIndexes[category][0]),
+ d->proxyModel->mapFromSource(d->categoriesIndexes[category][d->categoriesIndexes[category].count() - 1]));
+
+ selection << selectionRange;
+
+ selectionModel()->select(selection, QItemSelectionModel::Select);
break;
}
}
}
- viewport()->update();
+ d->lastSelection = selectionModel()->selection();
+
+ if (d->hovered.isValid())
+ viewport()->update(d->visualRect(d->hovered));
+ else if (!d->hoveredCategory.isEmpty())
+ viewport()->update(d->categoryVisualRect(d->hoveredCategory));
}
void KListView::leaveEvent(QEvent *event)
{
QListView::leaveEvent(event);
- d->hovered = QModelIndex();
-
if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
!d->itemCategorizer)
{
return;
}
- event->accept();
-
- viewport()->update();
+ d->hovered = QModelIndex();
+ d->hoveredCategory = QString();
}
void KListView::startDrag(Qt::DropActions supportedActions)
void KListView::dragMoveEvent(QDragMoveEvent *event)
{
- QListView::dragMoveEvent(event);
-
- d->mousePosition = event->pos();
-
if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
!d->itemCategorizer)
{
+ QListView::dragMoveEvent(event);
return;
}
+ d->mousePosition = event->pos();
+
if (d->mouseButtonPressed)
{
d->isDragging = true;
d->isDragging = false;
}
- event->accept();
+ d->dragLeftViewport = false;
+}
+
+void KListView::dragLeaveEvent(QDragLeaveEvent *event)
+{
+ QListView::dragLeaveEvent(event);
+
+ if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
+ !d->itemCategorizer)
+ {
+ return;
+ }
+
+ d->dragLeftViewport = true;
+}
- viewport()->update();
+QModelIndex KListView::moveCursor(CursorAction cursorAction,
+ Qt::KeyboardModifiers modifiers)
+{
+ if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
+ !d->itemCategorizer)
+ {
+ return QListView::moveCursor(cursorAction, modifiers);
+ }
+
+ return QListView::moveCursor(cursorAction, modifiers);
}
void KListView::rowsInserted(const QModelIndex &parent,
int start,
int end)
{
+ d->lastSelection = QItemSelection();
d->elementsInfo.clear();
d->elementsPosition.clear();
d->elementDictionary.clear();
d->categoriesIndexes.clear();
d->categoriesPosition.clear();
- d->isIndexSelected.clear(); // selection cache
d->categories.clear();
d->intersectedIndexes.clear();
d->sourceModelIndexList.clear();
int start,
int end)
{
- if (d->proxyModel)
+ if ((viewMode() == KListView::IconMode) && d->proxyModel &&
+ d->itemCategorizer)
{
// Force the view to update all elements
rowsInsertedArtifficial(parent, start, end);
projects / dolphin.git / blobdiff