X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/e92bbbe27ca39a1329ae3f2d6ecae128dd71855b..ba6c853219c78e4e2a491d416b94e4e4c1aef591:/src/klistview.cpp diff --git a/src/klistview.cpp b/src/klistview.cpp index 1cba47b1b..e484c3fb3 100644 --- a/src/klistview.cpp +++ b/src/klistview.cpp @@ -21,7 +21,8 @@ #include "klistview.h" #include "klistview_p.h" -#include // trunc +#include // trunc on C99 compliant systems +#include // trunc for not C99 compliant systems #include #include @@ -78,6 +79,8 @@ KListView::Private::Private(KListView *listView) : listView(listView) , itemCategorizer(0) , mouseButtonPressed(false) + , isDragging(false) + , dragLeftViewport(false) , proxyModel(0) , lastIndex(QModelIndex()) { @@ -385,9 +388,28 @@ void KListView::Private::updateScrollbars() { int lastItemBottom = cachedRectIndex(lastIndex).bottom() + listView->spacing() - listView->viewport()->height(); + + listView->verticalScrollBar()->setSingleStep(listView->viewport()->height() / 10); + listView->verticalScrollBar()->setPageStep(listView->viewport()->height()); listView->verticalScrollBar()->setRange(0, lastItemBottom); } +void KListView::Private::drawDraggedItems(QPainter *painter) +{ + QStyleOptionViewItemV3 option = listView->viewOptions(); + option.state &= ~QStyle::State_MouseOver; + foreach (const QModelIndex &index, listView->selectionModel()->selectedIndexes()) + { + int dx = mousePosition.x() - initialPressPosition.x() + listView->horizontalOffset(); + int 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); + } +} + //============================================================================== @@ -434,7 +456,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); @@ -482,11 +504,15 @@ void KListView::setItemCategorizer(KItemCategorizer *itemCategorizer) { rowsInserted(QModelIndex(), 0, d->proxyModel->rowCount() - 1); } + else + { + updateGeometries(); + } } 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); @@ -510,7 +536,7 @@ void KListView::reset() { QListView::reset(); - if ((viewMode() == KListView::ListMode) || !d->proxyModel || + if ((viewMode() != KListView::IconMode) || !d->proxyModel || !d->itemCategorizer) { return; @@ -530,7 +556,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); @@ -601,7 +627,7 @@ void KListView::paintEvent(QPaintEvent *event) } } - if (d->mouseButtonPressed) + if (d->mouseButtonPressed && !d->isDragging) { QPoint start, end, initialPressPosition; @@ -632,6 +658,12 @@ void KListView::paintEvent(QPaintEvent *event) painter.restore(); } + if (d->isDragging && !d->dragLeftViewport) + { + painter.setOpacity(0.5); + d->drawDraggedItems(&painter); + } + painter.restore(); } @@ -639,7 +671,7 @@ void KListView::resizeEvent(QResizeEvent *event) { QListView::resizeEvent(event); - if ((viewMode() == KListView::ListMode) || !d->proxyModel || + if ((viewMode() != KListView::IconMode) || !d->proxyModel || !d->itemCategorizer) { return; @@ -655,55 +687,83 @@ 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) + { + selection = QItemSelection(dirtyIndexes[0], dirtyIndexes[0]); + } + else { - foreach (const QModelIndex &index, selectionModel()->selectedIndexes()) + 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); + + viewport()->update(); } void KListView::mouseMoveEvent(QMouseEvent *event) { - QListView::mouseMoveEvent(event); - d->mousePosition = event->pos(); - if ((viewMode() == KListView::ListMode) || !d->proxyModel || + QListView::mouseMoveEvent(event); + + if ((viewMode() != KListView::IconMode) || !d->proxyModel || !d->itemCategorizer) { return; @@ -718,9 +778,7 @@ 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; @@ -728,6 +786,8 @@ void KListView::mousePressEvent(QMouseEvent *event) event->accept(); + d->dragLeftViewport = false; + if (event->button() == Qt::LeftButton) { d->mouseButtonPressed = true; @@ -746,9 +806,7 @@ 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; @@ -756,40 +814,34 @@ void KListView::mouseReleaseEvent(QMouseEvent *event) 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; } } } + d->lastSelection = selectionModel()->selection(); + viewport()->update(); } @@ -799,24 +851,89 @@ void KListView::leaveEvent(QEvent *event) d->hovered = QModelIndex(); - if ((viewMode() == KListView::ListMode) || !d->proxyModel || + if ((viewMode() != KListView::IconMode) || !d->proxyModel || + !d->itemCategorizer) + { + return; + } + + event->accept(); + + viewport()->update(); +} + +void KListView::startDrag(Qt::DropActions supportedActions) +{ + QListView::startDrag(supportedActions); + + d->isDragging = false; + d->mouseButtonPressed = false; +} + +void KListView::dragMoveEvent(QDragMoveEvent *event) +{ + QListView::dragMoveEvent(event); + + d->mousePosition = event->pos(); + + if ((viewMode() != KListView::IconMode) || !d->proxyModel || + !d->itemCategorizer) + { + return; + } + + if (d->mouseButtonPressed) + { + d->isDragging = true; + } + else + { + d->isDragging = false; + } + + d->dragLeftViewport = false; + + event->accept(); + + viewport()->update(); +} + +void KListView::dragLeaveEvent(QDragLeaveEvent *event) +{ + QListView::dragLeaveEvent(event); + + if ((viewMode() != KListView::IconMode) || !d->proxyModel || !d->itemCategorizer) { return; } + d->dragLeftViewport = true; + event->accept(); 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) { QListView::rowsInserted(parent, start, end); - if ((viewMode() == KListView::ListMode) || !d->proxyModel || + if ((viewMode() != KListView::IconMode) || !d->proxyModel || !d->itemCategorizer) { return; @@ -826,9 +943,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(); @@ -932,7 +1050,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); @@ -941,7 +1060,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(); @@ -955,11 +1074,11 @@ void KListView::updateGeometries() void KListView::slotSortingRoleChanged() { - if (d->proxyModel) + if ((viewMode() == KListView::IconMode) && d->proxyModel && + d->itemCategorizer) { // Force the view to update all elements - rowsInsertedArtifficial(QModelIndex(), 0, d->proxyModel->rowCount() - - 1); + rowsInsertedArtifficial(QModelIndex(), 0, d->proxyModel->rowCount() - 1); } }