X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/75480d07cd820c75ca418b990d3059f154bbdf6e..040bdcea237e2576aad744bc4e7b5cadedcc98dc:/src/dolphindetailsview.cpp diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp index 8aff93bfa..5c77ff710 100644 --- a/src/dolphindetailsview.cpp +++ b/src/dolphindetailsview.cpp @@ -47,16 +47,16 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* controller) : QTreeView(parent), - m_autoResize(true), + m_autoResize(true), m_expandingTogglePressed(false), m_keyPressed(false), m_useDefaultIndexAt(true), + m_ignoreScrollTo(false), m_controller(controller), m_selectionManager(0), m_font(), m_decorationSize(), - m_band(), - m_ignoreScrollTo(false) + m_band() { const DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings(); Q_ASSERT(settings != 0); @@ -245,6 +245,7 @@ void DolphinDetailsView::mousePressEvent(QMouseEvent* event) const QPoint scrollPos(horizontalScrollBar()->value(), verticalScrollBar()->value()); m_band.origin = event->pos() + pos + scrollPos; m_band.destination = m_band.origin; + m_band.originalSelection = selectionModel()->selection(); } } } @@ -306,13 +307,13 @@ void DolphinDetailsView::mouseReleaseEvent(QMouseEvent* event) void DolphinDetailsView::startDrag(Qt::DropActions supportedActions) { - DragAndDropHelper::startDrag(this, supportedActions, m_controller); + DragAndDropHelper::instance().startDrag(this, supportedActions, m_controller); m_band.show = false; } void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event) { - if (DragAndDropHelper::isMimeDataSupported(event->mimeData())) { + if (DragAndDropHelper::instance().isMimeDataSupported(event->mimeData())) { event->acceptProposedAction(); } @@ -345,7 +346,7 @@ void DolphinDetailsView::dragMoveEvent(QDragMoveEvent* event) setDirtyRegion(m_dropRect); } - if (DragAndDropHelper::isMimeDataSupported(event->mimeData())) { + if (DragAndDropHelper::instance().isMimeDataSupported(event->mimeData())) { // accept url drops, independently from the destination item event->acceptProposedAction(); } @@ -513,6 +514,13 @@ void DolphinDetailsView::updateElasticBand() QRect dirtyRegion(elasticBandRect()); const QPoint scrollPos(horizontalScrollBar()->value(), verticalScrollBar()->value()); m_band.destination = viewport()->mapFromGlobal(QCursor::pos()) + scrollPos; + // Going above the (logical) top-left of the view causes complications during selection; + // we may as well prevent it. + if (m_band.destination.y() < 0) + m_band.destination.setY(0); + if (m_band.destination.x() < 0) + m_band.destination.setX(0); + dirtyRegion = dirtyRegion.united(elasticBandRect()); setDirtyRegion(dirtyRegion); } @@ -605,7 +613,10 @@ void DolphinDetailsView::slotHeaderSectionResized(int logicalIndex, int oldSize, Q_UNUSED(logicalIndex); Q_UNUSED(oldSize); Q_UNUSED(newSize); - if (QApplication::mouseButtons() & Qt::LeftButton) { + // If the user changes the size of the headers, the autoresize feature should be + // turned off. As there is no dedicated interface to find out whether the header + // section has been resized by the user or by a resize event, the following approach is used: + if ((QApplication::mouseButtons() & Qt::LeftButton) && isVisible()) { disableAutoResizing(); } } @@ -651,11 +662,14 @@ void DolphinDetailsView::updateElasticBandSelection() const int nameColumnX = header()->sectionPosition(DolphinModel::Name); const int nameColumnWidth = header()->sectionSize(DolphinModel::Name); QRect selRect = elasticBandRect().normalized(); - QRect nameColumnRect(nameColumnX, selRect.y(), nameColumnWidth, selRect.height()); - selRect = nameColumnRect.intersect(selRect).normalized(); + QRect nameColumnArea(nameColumnX, selRect.y(), nameColumnWidth, selRect.height()); + selRect = nameColumnArea.intersect(selRect).normalized(); + // Get the last elastic band rectangle, expressed in viewpoint coordinates. + const QPoint scrollPos(horizontalScrollBar()->value(), verticalScrollBar()->value()); + QRect oldSelRect = QRect(m_band.lastSelectionOrigin - scrollPos, m_band.lastSelectionDestination - scrollPos).normalized(); if (selRect.isNull()) { - clearSelection(); + selectionModel()->select(m_band.originalSelection, QItemSelectionModel::ClearAndSelect); m_band.ignoreOldInfo = true; return; } @@ -669,17 +683,16 @@ void DolphinDetailsView::updateElasticBandSelection() // No items in the model presumably. return; } - + // If the elastic band does not cover the same rows as before, we'll // need to re-check, and also invalidate the old item distances. const int rowHeight = QTreeView::rowHeight(dummyIndex); const bool coveringSameRows = - (selRect.top() / rowHeight == m_band.oldSelectionRect.top() / rowHeight) && - (selRect.bottom() / rowHeight == m_band.oldSelectionRect.bottom() / rowHeight); + (selRect.top() / rowHeight == oldSelRect.top() / rowHeight) && + (selRect.bottom() / rowHeight == oldSelRect.bottom() / rowHeight); if (coveringSameRows) { // Covering the same rows, but have we moved far enough horizontally // that we might have (de)selected some other items? - const QRect oldSelRect = m_band.oldSelectionRect; const bool itemSelectionChanged = ((selRect.left() > oldSelRect.left()) && (selRect.left() > m_band.insideNearestLeftEdge)) || @@ -695,6 +708,13 @@ void DolphinDetailsView::updateElasticBandSelection() } } } + else { + // This is the only piece of optimization data that needs to be explicitly + // discarded. + m_band.lastSelectionOrigin = QPoint(); + m_band.lastSelectionDestination = QPoint(); + oldSelRect = selRect; + } // Do the selection from scratch. Force a update of the horizontal distances info. m_band.insideNearestLeftEdge = nameColumnX + nameColumnWidth + 1; @@ -704,7 +724,7 @@ void DolphinDetailsView::updateElasticBandSelection() // Include the old selection rect as well, so we can deselect // items that were inside it but not in the new selRect. - const QRect boundingRect = selRect.united(m_band.oldSelectionRect).normalized(); + const QRect boundingRect = selRect.united(oldSelRect).normalized(); if (boundingRect.isNull()) { return; } @@ -718,7 +738,7 @@ void DolphinDetailsView::updateElasticBandSelection() startIndex = model()->index(startIndex.row(), KDirModel::Name); } if (!startIndex.isValid()) { - clearSelection(); + selectionModel()->select(m_band.originalSelection, QItemSelectionModel::ClearAndSelect); m_band.ignoreOldInfo = true; return; } @@ -729,7 +749,7 @@ void DolphinDetailsView::updateElasticBandSelection() QModelIndex currIndex = startIndex; QModelIndex lastIndex; bool allItemsInBoundDone = false; - + // Calling selectionModel()->select(...) for each item that needs to be // toggled is slow as each call emits selectionChanged(...) so store them // and do the selection toggle in one batch. @@ -740,11 +760,9 @@ void DolphinDetailsView::updateElasticBandSelection() QModelIndex toggleIndexRangeBegin = QModelIndex(); do { - QRect currIndexRect = visualRect(currIndex); - const QString name = m_controller->itemForIndex(currIndex).name(); - currIndexRect.setWidth(DolphinFileItemDelegate::nameColumnWidth(name, viewOptions())); + QRect currIndexRect = nameColumnRect(currIndex); - // Update some optimisation info as we go. + // Update some optimization info as we go. const int cr = currIndexRect.right(); const int cl = currIndexRect.left(); const int sl = selRect.left(); @@ -764,8 +782,10 @@ void DolphinDetailsView::updateElasticBandSelection() } bool currentlySelected = selectionModel()->isSelected(currIndex); + bool originallySelected = m_band.originalSelection.contains(currIndex); bool intersectsSelectedRect = currIndexRect.intersects(selRect); - bool needToToggleItem = (currentlySelected && !intersectsSelectedRect) || (!currentlySelected && intersectsSelectedRect); + bool shouldBeSelected = (intersectsSelectedRect && !originallySelected) || (!intersectsSelectedRect && originallySelected); + bool needToToggleItem = (currentlySelected && !shouldBeSelected) || (!currentlySelected && shouldBeSelected); if (needToToggleItem && !formingToggleIndexRange) { toggleIndexRangeBegin = currIndex; formingToggleIndexRange = true; @@ -780,12 +800,21 @@ void DolphinDetailsView::updateElasticBandSelection() allItemsInBoundDone || currIndex.parent() != toggleIndexRangeBegin.parent()); if (commitToggleIndexRange) { - itemsToToggle.select(toggleIndexRangeBegin, lastIndex ); - // Immediately start a new range with currIndex? + formingToggleIndexRange = false; + // If this is the last item in the bounds and it is also the beginning of a range, + // don't toggle lastIndex - it will already have been dealt with. + if (!allItemsInBoundDone || toggleIndexRangeBegin != currIndex) { + itemsToToggle.select(toggleIndexRangeBegin, lastIndex); + } + // Need to start a new range immediately with currIndex? if (needToToggleItem) { toggleIndexRangeBegin = currIndex; + formingToggleIndexRange = true; + } + if (allItemsInBoundDone && needToToggleItem) { + // Toggle the very last item in the bounds. + itemsToToggle.select(currIndex, currIndex); } - formingToggleIndexRange = needToToggleItem; } // next item @@ -795,7 +824,8 @@ void DolphinDetailsView::updateElasticBandSelection() selectionModel()->select(itemsToToggle, QItemSelectionModel::Toggle); - m_band.oldSelectionRect = selRect; + m_band.lastSelectionOrigin = m_band.origin; + m_band.lastSelectionDestination = m_band.destination; m_band.ignoreOldInfo = false; } @@ -889,7 +919,7 @@ QRect DolphinDetailsView::nameColumnRect(const QModelIndex& index) const QRect rect = visualRect(index); const KFileItem item = m_controller->itemForIndex(index); if (!item.isNull()) { - const int width = DolphinFileItemDelegate::nameColumnWidth(item.name(), viewOptions()); + const int width = DolphinFileItemDelegate::nameColumnWidth(item.text(), viewOptions()); rect.setWidth(width); } @@ -900,7 +930,8 @@ DolphinDetailsView::ElasticBand::ElasticBand() : show(false), origin(), destination(), - oldSelectionRect(), + lastSelectionOrigin(), + lastSelectionDestination(), ignoreOldInfo(true), outsideNearestLeftEdge(0), outsideNearestRightEdge(0),