X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/689a80543f458e4ffb52de73005357212901a00c..fc49fd7b09e620d34b2beb3b119eee70eedb25d5:/src/klistview.cpp diff --git a/src/klistview.cpp b/src/klistview.cpp index 0c65b9141..526fb8dfc 100644 --- a/src/klistview.cpp +++ b/src/klistview.cpp @@ -79,6 +79,8 @@ KListView::Private::Private(KListView *listView) : listView(listView) , itemCategorizer(0) , mouseButtonPressed(false) + , isDragging(false) + , dragLeftViewport(false) , proxyModel(0) , lastIndex(QModelIndex()) { @@ -118,7 +120,6 @@ const QModelIndexList &KListView::Private::intersectionSet(const QRect &rect) } } - int j = 0; for (int i = middle; i < proxyModel->rowCount(); i++) { index = elementDictionary[proxyModel->index(i, 0)]; @@ -129,10 +130,9 @@ const QModelIndexList &KListView::Private::intersectionSet(const QRect &rect) // 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; @@ -331,8 +331,7 @@ void KListView::Private::drawNewCategory(const QString &category, 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 ? @@ -392,6 +391,48 @@ void KListView::Private::updateScrollbars() listView->verticalScrollBar()->setRange(0, lastItemBottom); } +void KListView::Private::drawDraggedItems(QPainter *painter) +{ + QStyleOptionViewItemV3 option = listView->viewOptions(); + option.state &= ~QStyle::State_MouseOver; + int dx; + int dy; + foreach (const QModelIndex &index, listView->selectionModel()->selectedIndexes()) + { + 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); + + listView->itemDelegate(index)->paint(painter, option, index); + } +} + +void KListView::Private::drawDraggedItems() +{ + int dx; + int dy; + QRect rectToUpdate; + QRect currentRect; + foreach (const QModelIndex &index, listView->selectionModel()->selectedIndexes()) + { + dx = mousePosition.x() - initialPressPosition.x() + listView->horizontalOffset(); + dy = mousePosition.y() - initialPressPosition.y() + listView->verticalOffset(); + + currentRect = visualRect(index); + currentRect.adjust(dx, dy, dx, dy); + + rectToUpdate = rectToUpdate.united(currentRect); + } + + listView->viewport()->update(lastDraggedItemsRect); + + lastDraggedItemsRect = rectToUpdate; + + listView->viewport()->update(rectToUpdate); +} + //============================================================================== @@ -438,7 +479,7 @@ void KListView::setModel(QAbstractItemModel *model) QRect KListView::visualRect(const QModelIndex &index) const { - if ((viewMode() == KListView::ListMode) || !d->proxyModel || + if ((viewMode() != KListView::IconMode) || !d->proxyModel || !d->itemCategorizer) { return QListView::visualRect(index); @@ -494,7 +535,7 @@ void KListView::setItemCategorizer(KItemCategorizer *itemCategorizer) QModelIndex KListView::indexAt(const QPoint &point) const { - if ((viewMode() == KListView::ListMode) || !d->proxyModel || + if ((viewMode() != KListView::IconMode) || !d->proxyModel || !d->itemCategorizer) { return QListView::indexAt(point); @@ -518,7 +559,7 @@ void KListView::reset() { QListView::reset(); - if ((viewMode() == KListView::ListMode) || !d->proxyModel || + if ((viewMode() != KListView::IconMode) || !d->proxyModel || !d->itemCategorizer) { return; @@ -538,7 +579,7 @@ void KListView::reset() void KListView::paintEvent(QPaintEvent *event) { - if ((viewMode() == KListView::ListMode) || !d->proxyModel || + if ((viewMode() != KListView::IconMode) || !d->proxyModel || !d->itemCategorizer) { QListView::paintEvent(event); @@ -596,20 +637,7 @@ void KListView::paintEvent(QPaintEvent *event) itemDelegate(index)->paint(&painter, option, index); } - // Redraw categories - QStyleOptionViewItem otherOption; - foreach (const QString &category, d->categories) - { - otherOption = option; - otherOption.rect = d->categoryVisualRect(category); - - if (otherOption.rect.intersects(area)) - { - d->drawNewCategory(category, otherOption, &painter); - } - } - - if (d->mouseButtonPressed) + if (d->mouseButtonPressed && !d->isDragging) { QPoint start, end, initialPressPosition; @@ -640,6 +668,25 @@ void KListView::paintEvent(QPaintEvent *event) painter.restore(); } + // Redraw categories + QStyleOptionViewItem otherOption; + foreach (const QString &category, d->categories) + { + otherOption = option; + otherOption.rect = d->categoryVisualRect(category); + + if (otherOption.rect.intersects(area)) + { + d->drawNewCategory(category, otherOption, &painter); + } + } + + if (d->isDragging && !d->dragLeftViewport) + { + painter.setOpacity(0.5); + d->drawDraggedItems(&painter); + } + painter.restore(); } @@ -647,7 +694,7 @@ void KListView::resizeEvent(QResizeEvent *event) { QListView::resizeEvent(event); - if ((viewMode() == KListView::ListMode) || !d->proxyModel || + if ((viewMode() != KListView::IconMode) || !d->proxyModel || !d->itemCategorizer) { return; @@ -663,78 +710,141 @@ void KListView::resizeEvent(QResizeEvent *event) void KListView::setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags flags) { - if ((viewMode() == KListView::ListMode) || !d->proxyModel || + if ((viewMode() != KListView::IconMode) || !d->proxyModel || !d->itemCategorizer) { QListView::setSelection(rect, flags); return; } - // FIXME: I have to rethink and rewrite this method (ereslibre) + if (!flags) + return; + + selectionModel()->clear(); + + if (flags & QItemSelectionModel::Clear) + { + d->lastSelection = QItemSelection(); + } 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()) { - selectionModel()->select(index, flags); + selectionModel()->select(d->lastSelection, flags); } - else - { - selectionModel()->select(index, QItemSelectionModel::Select); - if (d->mouseButtonPressed) - d->tempSelected.append(index); - } + return; } - if (d->mouseButtonPressed) + if (!d->mouseButtonPressed) { - foreach (const QModelIndex &index, selectionModel()->selectedIndexes()) + selection = QItemSelection(dirtyIndexes[0], dirtyIndexes[0]); + } + else + { + QModelIndex first = dirtyIndexes[0]; + QModelIndex last; + foreach (const QModelIndex &index, dirtyIndexes) { - if (!rect.intersects(visualRect(index))) + if (last.isValid() && last.row() + 1 != index.row()) { - selectionModel()->select(index, QItemSelectionModel::Deselect); + QItemSelectionRange range(first, last); - if (d->mouseButtonPressed) - { - d->tempSelected.removeAll(index); - } + selection << range; + + first = index; } + + last = index; } + + if (last.isValid()) + selection << QItemSelectionRange(first, last); + } + + if (d->lastSelection.count() && !d->mouseButtonPressed) + { + selection.merge(d->lastSelection, flags); + } + else if (d->lastSelection.count()) + { + selection.merge(d->lastSelection, QItemSelectionModel::Select); } + + selectionModel()->select(selection, flags); } void KListView::mouseMoveEvent(QMouseEvent *event) { QListView::mouseMoveEvent(event); - d->mousePosition = event->pos(); - - if ((viewMode() == KListView::ListMode) || !d->proxyModel || + if ((viewMode() != KListView::IconMode) || !d->proxyModel || !d->itemCategorizer) { return; } - event->accept(); + d->mousePosition = event->pos(); + d->hoveredCategory = QString(); - viewport()->update(); + // Redraw categories + foreach (const QString &category, d->categories) + { + if (d->categoryVisualRect(category).intersects(QRect(event->pos(), event->pos()))) + { + d->hoveredCategory = category; + } + + viewport()->update(d->categoryVisualRect(category)); + } + + QRect rect; + if (d->mouseButtonPressed && !d->isDragging) + { + QPoint start, end, initialPressPosition; + + initialPressPosition = d->initialPressPosition; + + initialPressPosition.setY(initialPressPosition.y() - verticalOffset()); + initialPressPosition.setX(initialPressPosition.x() - horizontalOffset()); + + if (d->initialPressPosition.x() > d->mousePosition.x() || + d->initialPressPosition.y() > d->mousePosition.y()) + { + start = d->mousePosition; + end = initialPressPosition; + } + else + { + start = initialPressPosition; + end = d->mousePosition; + } + + viewport()->update(d->lastSelectionRect); + + rect = QRect(start, end).intersected(viewport()->rect().adjusted(-16, -16, 16, 16)); + + viewport()->update(rect); + + d->lastSelectionRect = rect; + } } void KListView::mousePressEvent(QMouseEvent *event) { QListView::mousePressEvent(event); - d->tempSelected.clear(); - - if ((viewMode() == KListView::ListMode) || !d->proxyModel || + if ((viewMode() != KListView::IconMode) || !d->proxyModel || !d->itemCategorizer) { return; } - event->accept(); + d->dragLeftViewport = false; if (event->button() == Qt::LeftButton) { @@ -746,83 +856,122 @@ void KListView::mousePressEvent(QMouseEvent *event) d->initialPressPosition.setX(d->initialPressPosition.x() + horizontalOffset()); } - - viewport()->update(); } void KListView::mouseReleaseEvent(QMouseEvent *event) { QListView::mouseReleaseEvent(event); - d->mouseButtonPressed = false; - - if ((viewMode() == KListView::ListMode) || !d->proxyModel || + if ((viewMode() != KListView::IconMode) || !d->proxyModel || !d->itemCategorizer) { return; } - event->accept(); - - // FIXME: I have to rethink and rewrite this method (ereslibre) + 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) { foreach(const QString &category, d->categories) { if (d->categoryVisualRect(category).contains(event->pos())) { - QModelIndex index; - QItemSelectionModel::SelectionFlag flag; - foreach (const QModelIndex &mappedIndex, - d->categoriesIndexes[category]) - { - index = d->proxyModel->mapFromSource(mappedIndex); - - if (selectionModel()->selectedIndexes().contains(index)) - { - flag = QItemSelectionModel::Deselect; - } - else - { - flag = QItemSelectionModel::Select; - } - - selectionModel()->select(index, flag); - } + 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); + if ((viewMode() != KListView::IconMode) || !d->proxyModel || + !d->itemCategorizer) + { + return; + } + d->hovered = QModelIndex(); + d->hoveredCategory = QString(); +} + +void KListView::startDrag(Qt::DropActions supportedActions) +{ + QListView::startDrag(supportedActions); + + d->isDragging = false; + d->mouseButtonPressed = false; +} - if ((viewMode() == KListView::ListMode) || !d->proxyModel || +void KListView::dragMoveEvent(QDragMoveEvent *event) +{ + if ((viewMode() != KListView::IconMode) || !d->proxyModel || !d->itemCategorizer) { + QListView::dragMoveEvent(event); return; } - event->accept(); + d->mousePosition = event->pos(); + + if (d->mouseButtonPressed) + { + d->isDragging = true; + } + else + { + d->isDragging = false; + } - viewport()->update(); + d->dragLeftViewport = false; + + d->drawDraggedItems(); } -void KListView::startDrag(Qt::DropActions supportedActions) +void KListView::dragLeaveEvent(QDragLeaveEvent *event) { - d->mouseButtonPressed = false; + QListView::dragLeaveEvent(event); - QListView::startDrag(supportedActions); + if ((viewMode() != KListView::IconMode) || !d->proxyModel || + !d->itemCategorizer) + { + return; + } + + d->dragLeftViewport = true; +} + +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, @@ -831,7 +980,7 @@ void KListView::rowsInserted(const QModelIndex &parent, { QListView::rowsInserted(parent, start, end); - if ((viewMode() == KListView::ListMode) || !d->proxyModel || + if ((viewMode() != KListView::IconMode) || !d->proxyModel || !d->itemCategorizer) { return; @@ -841,9 +990,10 @@ void KListView::rowsInserted(const QModelIndex &parent, } void KListView::rowsInsertedArtifficial(const QModelIndex &parent, - int start, - int end) + int start, + int end) { + d->lastSelection = QItemSelection(); d->elementsInfo.clear(); d->elementsPosition.clear(); d->elementDictionary.clear(); @@ -947,7 +1097,8 @@ void KListView::rowsRemoved(const QModelIndex &parent, 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); @@ -956,7 +1107,7 @@ void KListView::rowsRemoved(const QModelIndex &parent, void KListView::updateGeometries() { - if ((viewMode() == KListView::ListMode) || !d->proxyModel || + if ((viewMode() != KListView::IconMode) || !d->proxyModel || !d->itemCategorizer) { QListView::updateGeometries();