X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/e92bbbe27ca39a1329ae3f2d6ecae128dd71855b..123e5008ae1feba49a4a2d2ca5cf3bf97fda30ac:/src/klistview.cpp diff --git a/src/klistview.cpp b/src/klistview.cpp index 1cba47b1b..fa78de638 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()) { @@ -117,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)]; @@ -128,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; @@ -330,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 ? @@ -385,9 +385,30 @@ 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; + 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); + } +} + //============================================================================== @@ -434,7 +455,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 +503,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 +535,7 @@ void KListView::reset() { QListView::reset(); - if ((viewMode() == KListView::ListMode) || !d->proxyModel || + if ((viewMode() != KListView::IconMode) || !d->proxyModel || !d->itemCategorizer) { return; @@ -530,7 +555,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 +626,7 @@ void KListView::paintEvent(QPaintEvent *event) } } - if (d->mouseButtonPressed) + if (d->mouseButtonPressed && !d->isDragging) { QPoint start, end, initialPressPosition; @@ -632,6 +657,12 @@ void KListView::paintEvent(QPaintEvent *event) painter.restore(); } + if (d->isDragging && !d->dragLeftViewport) + { + painter.setOpacity(0.5); + d->drawDraggedItems(&painter); + } + painter.restore(); } @@ -639,7 +670,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,78 +686,110 @@ 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); + + selection << range; - if (d->mouseButtonPressed) - { - d->tempSelected.removeAll(index); - } + 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(); + + // 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) { 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) { @@ -738,76 +801,120 @@ 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); - if ((viewMode() == KListView::ListMode) || !d->proxyModel || + d->isDragging = false; + d->mouseButtonPressed = false; +} + +void KListView::dragMoveEvent(QDragMoveEvent *event) +{ + if ((viewMode() != KListView::IconMode) || !d->proxyModel || !d->itemCategorizer) { + QListView::dragMoveEvent(event); return; } - event->accept(); + d->mousePosition = event->pos(); - viewport()->update(); + if (d->mouseButtonPressed) + { + d->isDragging = true; + } + else + { + d->isDragging = false; + } + + d->dragLeftViewport = false; +} + +void KListView::dragLeaveEvent(QDragLeaveEvent *event) +{ + QListView::dragLeaveEvent(event); + + 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, @@ -816,7 +923,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; @@ -826,9 +933,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 +1040,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 +1050,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 +1064,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); } }