X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/a24327cd50ef17b953ecb908d260b73460158107..a59d9f85fa770a00d10e66025e102c736e18fa70:/src/kitemviews/kitemlistcontroller.cpp diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp index 0d48bb5e3..0016bb22a 100644 --- a/src/kitemviews/kitemlistcontroller.cpp +++ b/src/kitemviews/kitemlistcontroller.cpp @@ -13,10 +13,12 @@ #include "kitemlistview.h" #include "private/kitemlistkeyboardsearchmanager.h" #include "private/kitemlistrubberband.h" -#include "private/ktwofingerswipe.h" -#include "private/ktwofingertap.h" #include "views/draganddrophelper.h" +#include +#include +#include + #include #include #include @@ -28,39 +30,37 @@ #include #include -KItemListController::KItemListController(KItemModelBase* model, KItemListView* view, QObject* parent) : - QObject(parent), - m_singleClickActivationEnforced(false), - m_selectionTogglePressed(false), - m_clearSelectionIfItemsAreNotDragged(false), - m_isSwipeGesture(false), - m_dragActionOrRightClick(false), - m_scrollerIsScrolling(false), - m_pinchGestureInProgress(false), - m_mousePress(false), - m_isTouchEvent(false), - m_selectionBehavior(NoSelection), - m_autoActivationBehavior(ActivationAndExpansion), - m_mouseDoubleClickAction(ActivateItemOnly), - m_model(nullptr), - m_view(nullptr), - m_selectionManager(new KItemListSelectionManager(this)), - m_keyboardManager(new KItemListKeyboardSearchManager(this)), - m_pressedIndex(-1), - m_pressedMousePos(), - m_autoActivationTimer(nullptr), - m_swipeGesture(Qt::CustomGesture), - m_twoFingerTapGesture(Qt::CustomGesture), - m_oldSelection(), - m_keyboardAnchorIndex(-1), - m_keyboardAnchorPos(0) +KItemListController::KItemListController(KItemModelBase *model, KItemListView *view, QObject *parent) + : QObject(parent) + , m_singleClickActivationEnforced(false) + , m_selectionMode(false) + , m_selectionTogglePressed(false) + , m_clearSelectionIfItemsAreNotDragged(false) + , m_isSwipeGesture(false) + , m_dragActionOrRightClick(false) + , m_scrollerIsScrolling(false) + , m_pinchGestureInProgress(false) + , m_mousePress(false) + , m_isTouchEvent(false) + , m_selectionBehavior(NoSelection) + , m_autoActivationBehavior(ActivationAndExpansion) + , m_mouseDoubleClickAction(ActivateItemOnly) + , m_model(nullptr) + , m_view(nullptr) + , m_selectionManager(new KItemListSelectionManager(this)) + , m_keyboardManager(new KItemListKeyboardSearchManager(this)) + , m_pressedIndex(std::nullopt) + , m_pressedMouseGlobalPos() + , m_autoActivationTimer(nullptr) + , m_swipeGesture(Qt::CustomGesture) + , m_twoFingerTapGesture(Qt::CustomGesture) + , m_oldSelection() + , m_keyboardAnchorIndex(-1) + , m_keyboardAnchorPos(0) { - connect(m_keyboardManager, &KItemListKeyboardSearchManager::changeCurrentItem, - this, &KItemListController::slotChangeCurrentItem); - connect(m_selectionManager, &KItemListSelectionManager::currentChanged, - m_keyboardManager, &KItemListKeyboardSearchManager::slotCurrentChanged); - connect(m_selectionManager, &KItemListSelectionManager::selectionChanged, - m_keyboardManager, &KItemListKeyboardSearchManager::slotSelectionChanged); + connect(m_keyboardManager, &KItemListKeyboardSearchManager::changeCurrentItem, this, &KItemListController::slotChangeCurrentItem); + connect(m_selectionManager, &KItemListSelectionManager::currentChanged, m_keyboardManager, &KItemListKeyboardSearchManager::slotCurrentChanged); + connect(m_selectionManager, &KItemListSelectionManager::selectionChanged, m_keyboardManager, &KItemListKeyboardSearchManager::slotSelectionChanged); m_autoActivationTimer = new QTimer(this); m_autoActivationTimer->setSingleShot(true); @@ -88,13 +88,13 @@ KItemListController::~KItemListController() Q_ASSERT(!m_model); } -void KItemListController::setModel(KItemModelBase* model) +void KItemListController::setModel(KItemModelBase *model) { if (m_model == model) { return; } - KItemModelBase* oldModel = m_model; + KItemModelBase *oldModel = m_model; if (oldModel) { oldModel->deleteLater(); } @@ -110,26 +110,26 @@ void KItemListController::setModel(KItemModelBase* model) m_selectionManager->setModel(m_model); - emit modelChanged(m_model, oldModel); + Q_EMIT modelChanged(m_model, oldModel); } -KItemModelBase* KItemListController::model() const +KItemModelBase *KItemListController::model() const { return m_model; } -KItemListSelectionManager* KItemListController::selectionManager() const +KItemListSelectionManager *KItemListController::selectionManager() const { return m_selectionManager; } -void KItemListController::setView(KItemListView* view) +void KItemListController::setView(KItemListView *view) { if (m_view == view) { return; } - KItemListView* oldView = m_view; + KItemListView *oldView = m_view; if (oldView) { disconnect(oldView, &KItemListView::scrollOffsetChanged, this, &KItemListController::slotViewScrollOffsetChanged); oldView->deleteLater(); @@ -145,10 +145,10 @@ void KItemListController::setView(KItemListView* view) updateExtendedSelectionRegion(); } - emit viewChanged(m_view, oldView); + Q_EMIT viewChanged(m_view, oldView); } -KItemListView* KItemListController::view() const +KItemListView *KItemListController::view() const { return m_view; } @@ -186,11 +186,13 @@ KItemListController::MouseDoubleClickAction KItemListController::mouseDoubleClic int KItemListController::indexCloseToMousePressedPosition() const { - QHashIterator it(m_view->m_visibleGroups); + const QPointF pressedMousePos = m_view->transform().map(m_view->scene()->views().first()->mapFromGlobal(m_pressedMouseGlobalPos.toPoint())); + + QHashIterator it(m_view->m_visibleGroups); while (it.hasNext()) { it.next(); KItemListGroupHeader *groupHeader = it.value(); - const QPointF mappedToGroup = groupHeader->mapFromItem(nullptr, m_pressedMousePos); + const QPointF mappedToGroup = groupHeader->mapFromItem(nullptr, pressedMousePos); if (groupHeader->contains(mappedToGroup)) { return it.key()->index(); } @@ -218,31 +220,57 @@ bool KItemListController::singleClickActivationEnforced() const return m_singleClickActivationEnforced; } -bool KItemListController::keyPressEvent(QKeyEvent* event) +void KItemListController::setSelectionModeEnabled(bool enabled) +{ + m_selectionMode = enabled; +} + +bool KItemListController::selectionMode() const +{ + return m_selectionMode; +} + +bool KItemListController::isSearchAsYouTypeActive() const +{ + return m_keyboardManager->isSearchAsYouTypeActive(); +} + +bool KItemListController::keyPressEvent(QKeyEvent *event) { int index = m_selectionManager->currentItem(); int key = event->key(); + const bool shiftPressed = event->modifiers() & Qt::ShiftModifier; // Handle the expanding/collapsing of items - if (m_view->supportsItemExpanding() && m_model->isExpandable(index)) { - if (key == Qt::Key_Right) { - if (m_model->setExpanded(index, true)) { - return true; + // expand / collapse all selected directories + if (m_view->supportsItemExpanding() && m_model->isExpandable(index) && (key == Qt::Key_Right || key == Qt::Key_Left)) { + const bool expandOrCollapse = key == Qt::Key_Right ? true : false; + bool shouldReturn = m_model->setExpanded(index, expandOrCollapse); + + // edit in reverse to preserve index of the first handled items + const auto selectedItems = m_selectionManager->selectedItems(); + for (auto it = selectedItems.rbegin(); it != selectedItems.rend(); ++it) { + shouldReturn |= m_model->setExpanded(*it, expandOrCollapse); + if (!shiftPressed) { + m_selectionManager->setSelected(*it); } - } else if (key == Qt::Key_Left) { - if (m_model->setExpanded(index, false)) { - return true; + } + if (shouldReturn) { + // update keyboard anchors + if (shiftPressed) { + m_keyboardAnchorIndex = selectedItems.count() > 0 ? qMin(index, selectedItems.last()) : index; + m_keyboardAnchorPos = keyboardAnchorPos(m_keyboardAnchorIndex); } + + event->ignore(); + return true; } } - const bool shiftPressed = event->modifiers() & Qt::ShiftModifier; const bool controlPressed = event->modifiers() & Qt::ControlModifier; const bool shiftOrControlPressed = shiftPressed || controlPressed; - const bool navigationPressed = key == Qt::Key_Home || key == Qt::Key_End || - key == Qt::Key_PageUp || key == Qt::Key_PageDown || - key == Qt::Key_Up || key == Qt::Key_Down || - key == Qt::Key_Left || key == Qt::Key_Right; + const bool navigationPressed = key == Qt::Key_Home || key == Qt::Key_End || key == Qt::Key_PageUp || key == Qt::Key_PageDown || key == Qt::Key_Up + || key == Qt::Key_Down || key == Qt::Key_Left || key == Qt::Key_Right; const int itemCount = m_model->count(); @@ -250,11 +278,20 @@ bool KItemListController::keyPressEvent(QKeyEvent* event) // the arrow keys to simplify the event handling. if (m_view->scrollOrientation() == Qt::Horizontal) { switch (key) { - case Qt::Key_Up: key = Qt::Key_Left; break; - case Qt::Key_Down: key = Qt::Key_Right; break; - case Qt::Key_Left: key = Qt::Key_Up; break; - case Qt::Key_Right: key = Qt::Key_Down; break; - default: break; + case Qt::Key_Up: + key = Qt::Key_Left; + break; + case Qt::Key_Down: + key = Qt::Key_Right; + break; + case Qt::Key_Left: + key = Qt::Key_Up; + break; + case Qt::Key_Right: + key = Qt::Key_Down; + break; + default: + break; } } @@ -305,11 +342,17 @@ bool KItemListController::keyPressEvent(QKeyEvent* event) case Qt::Key_Up: updateKeyboardAnchor(); + if (shiftPressed && !m_selectionManager->isAnchoredSelectionActive() && m_selectionManager->isSelected(index)) { + m_selectionManager->beginAnchoredSelection(index); + } index = previousRowIndex(index); break; case Qt::Key_Down: updateKeyboardAnchor(); + if (shiftPressed && !m_selectionManager->isAnchoredSelectionActive() && m_selectionManager->isSelected(index)) { + m_selectionManager->beginAnchoredSelection(index); + } index = nextRowIndex(index); break; @@ -373,11 +416,11 @@ bool KItemListController::keyPressEvent(QKeyEvent* event) case Qt::Key_Return: { const KItemSet selectedItems = m_selectionManager->selectedItems(); if (selectedItems.count() >= 2) { - emit itemsActivated(selectedItems); + Q_EMIT itemsActivated(selectedItems); } else if (selectedItems.count() == 1) { - emit itemActivated(selectedItems.first()); + Q_EMIT itemActivated(selectedItems.first()); } else { - emit itemActivated(index); + Q_EMIT itemActivated(index); } break; } @@ -389,8 +432,7 @@ bool KItemListController::keyPressEvent(QKeyEvent* event) int index = -1; if (selectedItems.count() >= 2) { const int currentItemIndex = m_selectionManager->currentItem(); - index = selectedItems.contains(currentItemIndex) - ? currentItemIndex : selectedItems.first(); + index = selectedItems.contains(currentItemIndex) ? currentItemIndex : selectedItems.first(); } else if (selectedItems.count() == 1) { index = selectedItems.first(); } @@ -398,19 +440,21 @@ bool KItemListController::keyPressEvent(QKeyEvent* event) if (index >= 0) { const QRectF contextRect = m_view->itemContextRect(index); const QPointF pos(m_view->scene()->views().first()->mapToGlobal(contextRect.bottomRight().toPoint())); - emit itemContextMenuRequested(index, pos); + Q_EMIT itemContextMenuRequested(index, pos); } else { - emit viewContextMenuRequested(QCursor::pos()); + Q_EMIT viewContextMenuRequested(QCursor::pos()); } break; } case Qt::Key_Escape: - if (m_selectionBehavior != SingleSelection) { + if (m_selectionMode) { + Q_EMIT selectionModeChangeRequested(false); + } else if (m_selectionBehavior != SingleSelection) { m_selectionManager->clearSelection(); } m_keyboardManager->cancelSearch(); - emit escapePressed(); + Q_EMIT escapePressed(); break; case Qt::Key_Space: @@ -430,7 +474,7 @@ bool KItemListController::keyPressEvent(QKeyEvent* event) } } } - Q_FALLTHROUGH(); // fall through to the default case and add the Space to the current search string. + Q_FALLTHROUGH(); // fall through to the default case and add the Space to the current search string. default: m_keyboardManager->addKeys(event->text()); // Make sure unconsumed events get propagated up the chain. #302329 @@ -475,7 +519,7 @@ bool KItemListController::keyPressEvent(QKeyEvent* event) return true; } -void KItemListController::slotChangeCurrentItem(const QString& text, bool searchFromNextItem) +void KItemListController::slotChangeCurrentItem(const QString &text, bool searchFromNextItem) { if (!m_model || m_model->count() == 0) { return; @@ -495,7 +539,7 @@ void KItemListController::slotChangeCurrentItem(const QString& text, bool search m_selectionManager->beginAnchoredSelection(index); } - m_view->scrollToItem(index); + m_view->scrollToItem(index, KItemListView::ViewItemPosition::Beginning); } } @@ -519,25 +563,26 @@ void KItemListController::slotAutoActivationTimeout() * * See Bug 293200 and 305783 */ - if (m_model->supportsDropping(index) && m_view->isUnderMouse()) { + if (m_view->isUnderMouse()) { if (m_view->supportsItemExpanding() && m_model->isExpandable(index)) { const bool expanded = m_model->isExpanded(index); m_model->setExpanded(index, !expanded); } else if (m_autoActivationBehavior != ExpansionOnly) { - emit itemActivated(index); + Q_EMIT itemActivated(index); } } } -bool KItemListController::inputMethodEvent(QInputMethodEvent* event) +bool KItemListController::inputMethodEvent(QInputMethodEvent *event) { Q_UNUSED(event) return false; } -bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const QTransform& transform) +bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent *event, const QTransform &transform) { m_mousePress = true; + m_pressedMouseGlobalPos = event->screenPos(); if (event->source() == Qt::MouseEventSynthesizedByQt && m_isTouchEvent) { return false; @@ -547,8 +592,8 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const return false; } - m_pressedMousePos = transform.map(event->pos()); - m_pressedIndex = m_view->itemAt(m_pressedMousePos); + const QPointF pressedMousePos = transform.map(event->pos()); + m_pressedIndex = m_view->itemAt(pressedMousePos); const Qt::MouseButtons buttons = event->buttons(); @@ -560,7 +605,7 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const return true; } -bool KItemListController::mouseMoveEvent(QGraphicsSceneMouseEvent* event, const QTransform& transform) +bool KItemListController::mouseMoveEvent(QGraphicsSceneMouseEvent *event, const QTransform &transform) { if (!m_view) { return false; @@ -574,16 +619,16 @@ bool KItemListController::mouseMoveEvent(QGraphicsSceneMouseEvent* event, const return false; } - if (m_pressedIndex >= 0) { + if (m_pressedIndex.has_value() && !m_view->rubberBand()->isActive()) { // Check whether a dragging should be started if (event->buttons() & Qt::LeftButton) { - const QPointF pos = transform.map(event->pos()); - if ((pos - m_pressedMousePos).manhattanLength() >= QApplication::startDragDistance()) { - if (!m_selectionManager->isSelected(m_pressedIndex)) { + const auto distance = (event->screenPos() - m_pressedMouseGlobalPos).manhattanLength(); + if (distance >= QApplication::startDragDistance()) { + if (!m_selectionManager->isSelected(m_pressedIndex.value())) { // Always assure that the dragged item gets selected. Usually this is already // done on the mouse-press event, but when using the selection-toggle on a // selected item the dragged item is not selected yet. - m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Toggle); + m_selectionManager->setSelected(m_pressedIndex.value(), 1, KItemListSelectionManager::Toggle); } else { // A selected item has been clicked to drag all selected items // -> the selection should not be cleared when the mouse button is released. @@ -594,26 +639,21 @@ bool KItemListController::mouseMoveEvent(QGraphicsSceneMouseEvent* event, const } } } else { - KItemListRubberBand* rubberBand = m_view->rubberBand(); + KItemListRubberBand *rubberBand = m_view->rubberBand(); if (rubberBand->isActive()) { QPointF endPos = transform.map(event->pos()); // Update the current item. - const int newCurrent = m_view->itemAt(endPos); - if (newCurrent >= 0) { + const std::optional newCurrent = m_view->itemAt(endPos); + if (newCurrent.has_value()) { // It's expected that the new current index is also the new anchor (bug 163451). m_selectionManager->endAnchoredSelection(); - m_selectionManager->setCurrentItem(newCurrent); - m_selectionManager->beginAnchoredSelection(newCurrent); + m_selectionManager->setCurrentItem(newCurrent.value()); + m_selectionManager->beginAnchoredSelection(newCurrent.value()); } if (m_view->scrollOrientation() == Qt::Vertical) { endPos.ry() += m_view->scrollOffset(); - if (m_view->itemSize().width() < 0) { - // Use a special rubberband for views that have only one column and - // expand the rubberband to use the whole width of the view. - endPos.setX(m_view->size().width()); - } } else { endPos.rx() += m_view->scrollOffset(); } @@ -624,7 +664,7 @@ bool KItemListController::mouseMoveEvent(QGraphicsSceneMouseEvent* event, const return false; } -bool KItemListController::mouseReleaseEvent(QGraphicsSceneMouseEvent* event, const QTransform& transform) +bool KItemListController::mouseReleaseEvent(QGraphicsSceneMouseEvent *event, const QTransform &transform) { m_mousePress = false; m_isTouchEvent = false; @@ -637,55 +677,54 @@ bool KItemListController::mouseReleaseEvent(QGraphicsSceneMouseEvent* event, con m_view->m_tapAndHoldIndicator->setActive(false); } - KItemListRubberBand* rubberBand = m_view->rubberBand(); + KItemListRubberBand *rubberBand = m_view->rubberBand(); if (event->source() == Qt::MouseEventSynthesizedByQt && !rubberBand->isActive() && m_isTouchEvent) { return false; } - emit mouseButtonReleased(m_pressedIndex, event->buttons()); + Q_EMIT mouseButtonReleased(m_pressedIndex.value_or(-1), event->buttons()); return onRelease(transform.map(event->pos()), event->modifiers(), event->button(), false); } -bool KItemListController::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event, const QTransform& transform) +bool KItemListController::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event, const QTransform &transform) { const QPointF pos = transform.map(event->pos()); - const int index = m_view->itemAt(pos); + const std::optional index = m_view->itemAt(pos); // Expand item if desired - See Bug 295573 if (m_mouseDoubleClickAction != ActivateItemOnly) { - if (m_view && m_model && m_view->supportsItemExpanding() && m_model->isExpandable(index)) { - const bool expanded = m_model->isExpanded(index); - m_model->setExpanded(index, !expanded); + if (m_view && m_model && m_view->supportsItemExpanding() && m_model->isExpandable(index.value_or(-1))) { + const bool expanded = m_model->isExpanded(index.value()); + m_model->setExpanded(index.value(), !expanded); } } if (event->button() & Qt::RightButton) { m_selectionManager->clearSelection(); - if (index >= 0) { - m_selectionManager->setSelected(index); - emit itemContextMenuRequested(index, event->screenPos()); + if (index.has_value()) { + m_selectionManager->setSelected(index.value()); + Q_EMIT itemContextMenuRequested(index.value(), event->screenPos()); } else { const QRectF headerBounds = m_view->headerBoundaries(); if (headerBounds.contains(event->pos())) { - emit headerContextMenuRequested(event->screenPos()); + Q_EMIT headerContextMenuRequested(event->screenPos()); } else { - emit viewContextMenuRequested(event->screenPos()); + Q_EMIT viewContextMenuRequested(event->screenPos()); } } return true; } - bool emitItemActivated = !(m_view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick) || m_singleClickActivationEnforced) && - (event->button() & Qt::LeftButton) && - index >= 0 && index < m_model->count(); + bool emitItemActivated = !(m_view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick) || m_singleClickActivationEnforced) + && (event->button() & Qt::LeftButton) && index.has_value() && index.value() < m_model->count(); if (emitItemActivated) { - emit itemActivated(index); + Q_EMIT itemActivated(index.value()); } return false; } -bool KItemListController::dragEnterEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform) +bool KItemListController::dragEnterEvent(QGraphicsSceneDragDropEvent *event, const QTransform &transform) { Q_UNUSED(event) Q_UNUSED(transform) @@ -695,7 +734,7 @@ bool KItemListController::dragEnterEvent(QGraphicsSceneDragDropEvent* event, con return false; } -bool KItemListController::dragLeaveEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform) +bool KItemListController::dragLeaveEvent(QGraphicsSceneDragDropEvent *event, const QTransform &transform) { Q_UNUSED(event) Q_UNUSED(transform) @@ -704,33 +743,33 @@ bool KItemListController::dragLeaveEvent(QGraphicsSceneDragDropEvent* event, con m_view->setAutoScroll(false); m_view->hideDropIndicator(); - KItemListWidget* widget = hoveredWidget(); + KItemListWidget *widget = hoveredWidget(); if (widget) { widget->setHovered(false); - emit itemUnhovered(widget->index()); + Q_EMIT itemUnhovered(widget->index()); } return false; } -bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform) +bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent *event, const QTransform &transform) { if (!m_model || !m_view) { return false; } - QUrl hoveredDir = m_model->directory(); - KItemListWidget* oldHoveredWidget = hoveredWidget(); + KItemListWidget *oldHoveredWidget = hoveredWidget(); const QPointF pos = transform.map(event->pos()); - KItemListWidget* newHoveredWidget = widgetForPos(pos); + KItemListWidget *newHoveredWidget = widgetForDropPos(pos); + int index = -1; if (oldHoveredWidget != newHoveredWidget) { m_autoActivationTimer->stop(); if (oldHoveredWidget) { oldHoveredWidget->setHovered(false); - emit itemUnhovered(oldHoveredWidget->index()); + Q_EMIT itemUnhovered(oldHoveredWidget->index()); } } @@ -741,31 +780,29 @@ bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, cons droppingBetweenItems = (m_view->showDropIndicator(pos) >= 0); } - const int index = newHoveredWidget->index(); + index = newHoveredWidget->index(); if (m_model->isDir(index)) { hoveredDir = m_model->url(index); } if (!droppingBetweenItems) { - if (m_model->supportsDropping(index)) { - // Something has been dragged on an item. - m_view->hideDropIndicator(); - if (!newHoveredWidget->isHovered()) { - newHoveredWidget->setHovered(true); - emit itemHovered(index); - } + // Something has been dragged on an item. + m_view->hideDropIndicator(); + if (!newHoveredWidget->isHovered()) { + newHoveredWidget->setHovered(true); + Q_EMIT itemHovered(index); + } - if (!m_autoActivationTimer->isActive() && m_autoActivationTimer->interval() >= 0) { - m_autoActivationTimer->setProperty("index", index); - m_autoActivationTimer->start(); - } + if (!m_autoActivationTimer->isActive() && m_autoActivationTimer->interval() >= 0) { + m_autoActivationTimer->setProperty("index", index); + m_autoActivationTimer->start(); } } else { m_autoActivationTimer->stop(); if (newHoveredWidget && newHoveredWidget->isHovered()) { newHoveredWidget->setHovered(false); - emit itemUnhovered(index); + Q_EMIT itemUnhovered(index); } } } else { @@ -776,13 +813,18 @@ bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, cons event->setDropAction(Qt::IgnoreAction); event->ignore(); } else { - event->setDropAction(event->proposedAction()); - event->accept(); + if (m_model->supportsDropping(index)) { + event->setDropAction(event->proposedAction()); + event->accept(); + } else { + event->setDropAction(Qt::IgnoreAction); + event->ignore(); + } } return false; } -bool KItemListController::dropEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform) +bool KItemListController::dropEvent(QGraphicsSceneDragDropEvent *event, const QTransform &transform) { if (!m_view) { return false; @@ -802,10 +844,15 @@ bool KItemListController::dropEvent(QGraphicsSceneDragDropEvent* event, const QT if (dropAboveIndex >= 0) { // Something has been dropped between two items. m_view->hideDropIndicator(); - emit aboveItemDropEvent(dropAboveIndex, event); + Q_EMIT aboveItemDropEvent(dropAboveIndex, event); } else if (!event->mimeData()->hasFormat(m_model->blacklistItemDropEventMimeType())) { // Something has been dropped on an item or on an empty part of the view. - emit itemDropEvent(m_view->itemAt(pos), event); + const KItemListWidget *receivingWidget = widgetForDropPos(pos); + if (receivingWidget) { + Q_EMIT itemDropEvent(receivingWidget->index(), event); + } else { + Q_EMIT itemDropEvent(-1, event); + } } QAccessibleEvent accessibilityEvent(view(), QAccessible::DragDropEnd); @@ -814,45 +861,96 @@ bool KItemListController::dropEvent(QGraphicsSceneDragDropEvent* event, const QT return true; } -bool KItemListController::hoverEnterEvent(QGraphicsSceneHoverEvent* event, const QTransform& transform) +bool KItemListController::hoverEnterEvent(QGraphicsSceneHoverEvent *event, const QTransform &transform) { Q_UNUSED(event) Q_UNUSED(transform) return false; } -bool KItemListController::hoverMoveEvent(QGraphicsSceneHoverEvent* event, const QTransform& transform) +bool KItemListController::hoverMoveEvent(QGraphicsSceneHoverEvent *event, const QTransform &transform) { Q_UNUSED(transform) if (!m_model || !m_view) { return false; } - KItemListWidget* oldHoveredWidget = hoveredWidget(); - const QPointF pos = transform.map(event->pos()); - KItemListWidget* newHoveredWidget = widgetForPos(pos); + // We identify the widget whose expansionArea had been hovered before this hoverMoveEvent() triggered. + // we can't use hoveredWidget() here (it handles the icon+text rect, not the expansion rect) + // like hoveredWidget(), we find the hovered widget for the expansion rect + const auto visibleItemListWidgets = m_view->visibleItemListWidgets(); + const auto oldHoveredExpansionWidgetIterator = std::find_if(visibleItemListWidgets.begin(), visibleItemListWidgets.end(), [](auto &widget) { + return widget->expansionAreaHovered(); + }); + const auto oldHoveredExpansionWidget = + oldHoveredExpansionWidgetIterator == visibleItemListWidgets.end() ? std::nullopt : std::make_optional(*oldHoveredExpansionWidgetIterator); - if (oldHoveredWidget != newHoveredWidget) { - if (oldHoveredWidget) { + const auto unhoverOldHoveredWidget = [&]() { + if (auto oldHoveredWidget = hoveredWidget(); oldHoveredWidget) { + // handle the text+icon one oldHoveredWidget->setHovered(false); - emit itemUnhovered(oldHoveredWidget->index()); + Q_EMIT itemUnhovered(oldHoveredWidget->index()); } + }; - if (newHoveredWidget) { - newHoveredWidget->setHovered(true); - const QPointF mappedPos = newHoveredWidget->mapFromItem(m_view, pos); - newHoveredWidget->setHoverPosition(mappedPos); - emit itemHovered(newHoveredWidget->index()); + const auto unhoverOldExpansionWidget = [&]() { + if (oldHoveredExpansionWidget) { + // then the expansion toggle + (*oldHoveredExpansionWidget)->setExpansionAreaHovered(false); } - } else if (oldHoveredWidget) { - const QPointF mappedPos = oldHoveredWidget->mapFromItem(m_view, pos); - oldHoveredWidget->setHoverPosition(mappedPos); - } + }; + + const QPointF pos = transform.map(event->pos()); + if (KItemListWidget *newHoveredWidget = widgetForPos(pos); newHoveredWidget) { + // something got hovered, work out which part and set hover for the appropriate widget + const auto mappedPos = newHoveredWidget->mapFromItem(m_view, pos); + const bool isOnExpansionToggle = newHoveredWidget->expansionToggleRect().contains(mappedPos); + + if (isOnExpansionToggle) { + // make sure we unhover the old one first if old!=new + if (oldHoveredExpansionWidget && *oldHoveredExpansionWidget != newHoveredWidget) { + (*oldHoveredExpansionWidget)->setExpansionAreaHovered(false); + } + // we also unhover any old icon+text hovers, in case the mouse movement from icon+text to expansion toggle is too fast (i.e. newHoveredWidget is never null between the transition) + unhoverOldHoveredWidget(); + + newHoveredWidget->setExpansionAreaHovered(true); + } else { + // make sure we unhover the old one first if old!=new + auto oldHoveredWidget = hoveredWidget(); + if (oldHoveredWidget && oldHoveredWidget != newHoveredWidget) { + oldHoveredWidget->setHovered(false); + Q_EMIT itemUnhovered(oldHoveredWidget->index()); + } + // we also unhover any old expansion toggle hovers, in case the mouse movement from expansion toggle to icon+text is too fast (i.e. newHoveredWidget is never null between the transition) + unhoverOldExpansionWidget(); + const bool isOverIconAndText = newHoveredWidget->iconRect().contains(mappedPos) || newHoveredWidget->textRect().contains(mappedPos); + const bool hasMultipleSelection = m_selectionManager->selectedItems().count() > 1; + + if (hasMultipleSelection && !isOverIconAndText) { + // In case we have multiple selections, clicking on any row will deselect the selection. + // So, as a visual cue for signalling that clicking anywhere won't select, but clear current highlights, + // we disable hover of the *row*(i.e. blank space to the right of the icon+text) + + // (no-op in this branch for masked hover) + } else { + newHoveredWidget->setHoverPosition(mappedPos); + if (oldHoveredWidget != newHoveredWidget) { + newHoveredWidget->setHovered(true); + Q_EMIT itemHovered(newHoveredWidget->index()); + } + } + } + } else { + // unhover any currently hovered expansion and text+icon widgets + unhoverOldHoveredWidget(); + unhoverOldExpansionWidget(); + } return false; } -bool KItemListController::hoverLeaveEvent(QGraphicsSceneHoverEvent* event, const QTransform& transform) +bool KItemListController::hoverLeaveEvent(QGraphicsSceneHoverEvent *event, const QTransform &transform) { Q_UNUSED(event) Q_UNUSED(transform) @@ -865,30 +963,30 @@ bool KItemListController::hoverLeaveEvent(QGraphicsSceneHoverEvent* event, const } const auto widgets = m_view->visibleItemListWidgets(); - for (KItemListWidget* widget : widgets) { + for (KItemListWidget *widget : widgets) { if (widget->isHovered()) { widget->setHovered(false); - emit itemUnhovered(widget->index()); + Q_EMIT itemUnhovered(widget->index()); } } return false; } -bool KItemListController::wheelEvent(QGraphicsSceneWheelEvent* event, const QTransform& transform) +bool KItemListController::wheelEvent(QGraphicsSceneWheelEvent *event, const QTransform &transform) { Q_UNUSED(event) Q_UNUSED(transform) return false; } -bool KItemListController::resizeEvent(QGraphicsSceneResizeEvent* event, const QTransform& transform) +bool KItemListController::resizeEvent(QGraphicsSceneResizeEvent *event, const QTransform &transform) { Q_UNUSED(event) Q_UNUSED(transform) return false; } -bool KItemListController::gestureEvent(QGestureEvent* event, const QTransform& transform) +bool KItemListController::gestureEvent(QGestureEvent *event, const QTransform &transform) { if (!m_view) { return false; @@ -898,8 +996,8 @@ bool KItemListController::gestureEvent(QGestureEvent* event, const QTransform& t //we use this to get the right QWidget //the only exception is a tap gesture with state GestureStarted, we need to reset some variable if (!m_mousePress) { - if (QGesture* tap = event->gesture(Qt::TapGesture)) { - QTapGesture* tapGesture = static_cast(tap); + if (QGesture *tap = event->gesture(Qt::TapGesture)) { + QTapGesture *tapGesture = static_cast(tap); if (tapGesture->state() == Qt::GestureStarted) { tapTriggered(tapGesture, transform); } @@ -909,8 +1007,8 @@ bool KItemListController::gestureEvent(QGestureEvent* event, const QTransform& t bool accepted = false; - if (QGesture* tap = event->gesture(Qt::TapGesture)) { - tapTriggered(static_cast(tap), transform); + if (QGesture *tap = event->gesture(Qt::TapGesture)) { + tapTriggered(static_cast(tap), transform); accepted = true; } if (event->gesture(Qt::TapAndHoldGesture)) { @@ -932,7 +1030,7 @@ bool KItemListController::gestureEvent(QGestureEvent* event, const QTransform& t return accepted; } -bool KItemListController::touchBeginEvent(QTouchEvent* event, const QTransform& transform) +bool KItemListController::touchBeginEvent(QTouchEvent *event, const QTransform &transform) { Q_UNUSED(event) Q_UNUSED(transform) @@ -941,7 +1039,7 @@ bool KItemListController::touchBeginEvent(QTouchEvent* event, const QTransform& return false; } -void KItemListController::tapTriggered(QTapGesture* tap, const QTransform& transform) +void KItemListController::tapTriggered(QTapGesture *tap, const QTransform &transform) { static bool scrollerWasActive = false; @@ -965,61 +1063,60 @@ void KItemListController::tapTriggered(QTapGesture* tap, const QTransform& trans m_view->m_tapAndHoldIndicator->setActive(false); } - m_pressedMousePos = transform.map(tap->position()); - m_pressedIndex = m_view->itemAt(m_pressedMousePos); - + const QPointF pressedMousePos = transform.map(tap->position()); + m_pressedIndex = m_view->itemAt(pressedMousePos); if (m_dragActionOrRightClick) { - onPress(tap->hotSpot().toPoint(), tap->position().toPoint(), Qt::NoModifier, Qt::RightButton); - onRelease(transform.map(tap->position()), Qt::NoModifier, Qt::RightButton, false); m_dragActionOrRightClick = false; - } - else { - onPress(tap->hotSpot().toPoint(), tap->position().toPoint(), Qt::NoModifier, Qt::LeftButton); + } else { + onPress(m_pressedMouseGlobalPos.toPoint(), tap->position().toPoint(), Qt::NoModifier, Qt::LeftButton); onRelease(transform.map(tap->position()), Qt::NoModifier, Qt::LeftButton, true); } m_isTouchEvent = false; } } -void KItemListController::tapAndHoldTriggered(QGestureEvent* event, const QTransform& transform) +void KItemListController::tapAndHoldTriggered(QGestureEvent *event, const QTransform &transform) { - //the Qt TabAndHold gesture is triggerable with a mouse click, we don't want this if (!m_isTouchEvent) { return; } - const QTapAndHoldGesture* tap = static_cast(event->gesture(Qt::TapAndHoldGesture)); + const QTapAndHoldGesture *tap = static_cast(event->gesture(Qt::TapAndHoldGesture)); if (tap->state() == Qt::GestureFinished) { //if a pinch gesture is in progress we don't want a TabAndHold gesture if (m_pinchGestureInProgress) { return; } - m_pressedMousePos = transform.map(event->mapToGraphicsScene(tap->position())); - m_pressedIndex = m_view->itemAt(m_pressedMousePos); - - if (m_pressedIndex >= 0 && !m_selectionManager->isSelected(m_pressedIndex)) { - m_selectionManager->clearSelection(); - m_selectionManager->setSelected(m_pressedIndex); - } else if (m_pressedIndex == -1) { + const QPointF pressedMousePos = transform.map(event->mapToGraphicsScene(tap->position())); + m_pressedIndex = m_view->itemAt(pressedMousePos); + if (m_pressedIndex.has_value()) { + if (!m_selectionManager->isSelected(m_pressedIndex.value())) { + m_selectionManager->clearSelection(); + m_selectionManager->setSelected(m_pressedIndex.value()); + } + if (!m_selectionMode) { + Q_EMIT selectionModeChangeRequested(true); + } + } else { m_selectionManager->clearSelection(); startRubberBand(); } - emit scrollerStop(); + Q_EMIT scrollerStop(); - m_view->m_tapAndHoldIndicator->setStartPosition(m_pressedMousePos); + m_view->m_tapAndHoldIndicator->setStartPosition(pressedMousePos); m_view->m_tapAndHoldIndicator->setActive(true); m_dragActionOrRightClick = true; } } -void KItemListController::pinchTriggered(QGestureEvent* event, const QTransform& transform) +void KItemListController::pinchTriggered(QGestureEvent *event, const QTransform &transform) { Q_UNUSED(transform) - const QPinchGesture* pinch = static_cast(event->gesture(Qt::PinchGesture)); + const QPinchGesture *pinch = static_cast(event->gesture(Qt::PinchGesture)); const qreal sensitivityModifier = 0.2; static qreal counter = 0; @@ -1034,20 +1131,20 @@ void KItemListController::pinchTriggered(QGestureEvent* event, const QTransform& } counter = counter + (pinch->scaleFactor() - 1); if (counter >= sensitivityModifier) { - emit increaseZoom(); + Q_EMIT increaseZoom(); counter = 0; } else if (counter <= -sensitivityModifier) { - emit decreaseZoom(); + Q_EMIT decreaseZoom(); counter = 0; } } } -void KItemListController::swipeTriggered(QGestureEvent* event, const QTransform& transform) +void KItemListController::swipeTriggered(QGestureEvent *event, const QTransform &transform) { Q_UNUSED(transform) - const KTwoFingerSwipe* swipe = static_cast(event->gesture(m_swipeGesture)); + const KTwoFingerSwipe *swipe = static_cast(event->gesture(m_swipeGesture)); if (!swipe) { return; @@ -1061,39 +1158,38 @@ void KItemListController::swipeTriggered(QGestureEvent* event, const QTransform& } if (swipe->state() == Qt::GestureFinished) { - emit scrollerStop(); + Q_EMIT scrollerStop(); if (swipe->swipeAngle() <= 20 || swipe->swipeAngle() >= 340) { - emit mouseButtonPressed(m_pressedIndex, Qt::BackButton); + Q_EMIT mouseButtonPressed(m_pressedIndex.value_or(-1), Qt::BackButton); } else if (swipe->swipeAngle() <= 200 && swipe->swipeAngle() >= 160) { - emit mouseButtonPressed(m_pressedIndex, Qt::ForwardButton); + Q_EMIT mouseButtonPressed(m_pressedIndex.value_or(-1), Qt::ForwardButton); } else if (swipe->swipeAngle() <= 110 && swipe->swipeAngle() >= 60) { - emit swipeUp(); + Q_EMIT swipeUp(); } m_isSwipeGesture = true; } } -void KItemListController::twoFingerTapTriggered(QGestureEvent* event, const QTransform& transform) +void KItemListController::twoFingerTapTriggered(QGestureEvent *event, const QTransform &transform) { - const KTwoFingerTap* twoTap = static_cast(event->gesture(m_twoFingerTapGesture)); + const KTwoFingerTap *twoTap = static_cast(event->gesture(m_twoFingerTapGesture)); if (!twoTap) { return; } if (twoTap->state() == Qt::GestureStarted) { - m_pressedMousePos = transform.map(twoTap->pos()); - m_pressedIndex = m_view->itemAt(m_pressedMousePos); - if (m_pressedIndex >= 0) { + const QPointF pressedMousePos = transform.map(twoTap->pos()); + m_pressedIndex = m_view->itemAt(pressedMousePos); + if (m_pressedIndex.has_value()) { onPress(twoTap->screenPos().toPoint(), twoTap->pos().toPoint(), Qt::ControlModifier, Qt::LeftButton); onRelease(transform.map(twoTap->pos()), Qt::ControlModifier, Qt::LeftButton, false); } - } } -bool KItemListController::processEvent(QEvent* event, const QTransform& transform) +bool KItemListController::processEvent(QEvent *event, const QTransform &transform) { if (!event) { return false; @@ -1101,39 +1197,39 @@ bool KItemListController::processEvent(QEvent* event, const QTransform& transfor switch (event->type()) { case QEvent::KeyPress: - return keyPressEvent(static_cast(event)); + return keyPressEvent(static_cast(event)); case QEvent::InputMethod: - return inputMethodEvent(static_cast(event)); + return inputMethodEvent(static_cast(event)); case QEvent::GraphicsSceneMousePress: - return mousePressEvent(static_cast(event), QTransform()); + return mousePressEvent(static_cast(event), QTransform()); case QEvent::GraphicsSceneMouseMove: - return mouseMoveEvent(static_cast(event), QTransform()); + return mouseMoveEvent(static_cast(event), QTransform()); case QEvent::GraphicsSceneMouseRelease: - return mouseReleaseEvent(static_cast(event), QTransform()); + return mouseReleaseEvent(static_cast(event), QTransform()); case QEvent::GraphicsSceneMouseDoubleClick: - return mouseDoubleClickEvent(static_cast(event), QTransform()); + return mouseDoubleClickEvent(static_cast(event), QTransform()); case QEvent::GraphicsSceneWheel: - return wheelEvent(static_cast(event), QTransform()); + return wheelEvent(static_cast(event), QTransform()); case QEvent::GraphicsSceneDragEnter: - return dragEnterEvent(static_cast(event), QTransform()); + return dragEnterEvent(static_cast(event), QTransform()); case QEvent::GraphicsSceneDragLeave: - return dragLeaveEvent(static_cast(event), QTransform()); + return dragLeaveEvent(static_cast(event), QTransform()); case QEvent::GraphicsSceneDragMove: - return dragMoveEvent(static_cast(event), QTransform()); + return dragMoveEvent(static_cast(event), QTransform()); case QEvent::GraphicsSceneDrop: - return dropEvent(static_cast(event), QTransform()); + return dropEvent(static_cast(event), QTransform()); case QEvent::GraphicsSceneHoverEnter: - return hoverEnterEvent(static_cast(event), QTransform()); + return hoverEnterEvent(static_cast(event), QTransform()); case QEvent::GraphicsSceneHoverMove: - return hoverMoveEvent(static_cast(event), QTransform()); + return hoverMoveEvent(static_cast(event), QTransform()); case QEvent::GraphicsSceneHoverLeave: - return hoverLeaveEvent(static_cast(event), QTransform()); + return hoverLeaveEvent(static_cast(event), QTransform()); case QEvent::GraphicsSceneResize: - return resizeEvent(static_cast(event), transform); + return resizeEvent(static_cast(event), transform); case QEvent::Gesture: - return gestureEvent(static_cast(event), transform); + return gestureEvent(static_cast(event), transform); case QEvent::TouchBegin: - return touchBeginEvent(static_cast(event), transform); + return touchBeginEvent(static_cast(event), transform); default: break; } @@ -1147,7 +1243,7 @@ void KItemListController::slotViewScrollOffsetChanged(qreal current, qreal previ return; } - KItemListRubberBand* rubberBand = m_view->rubberBand(); + KItemListRubberBand *rubberBand = m_view->rubberBand(); if (rubberBand->isActive()) { const qreal diff = current - previous; // TODO: Ideally just QCursor::pos() should be used as @@ -1171,7 +1267,7 @@ void KItemListController::slotRubberBandChanged() return; } - const KItemListRubberBand* rubberBand = m_view->rubberBand(); + const KItemListRubberBand *rubberBand = m_view->rubberBand(); const QPointF startPos = rubberBand->startPosition(); const QPointF endPos = rubberBand->endPosition(); QRectF rubberBandRect = QRectF(startPos, endPos).normalized(); @@ -1186,9 +1282,8 @@ void KItemListController::slotRubberBandChanged() if (!m_oldSelection.isEmpty()) { // Clear the old selection that was available before the rubberband has // been activated in case if no Shift- or Control-key are pressed - const bool shiftOrControlPressed = QApplication::keyboardModifiers() & Qt::ShiftModifier || - QApplication::keyboardModifiers() & Qt::ControlModifier; - if (!shiftOrControlPressed) { + const bool shiftOrControlPressed = QApplication::keyboardModifiers() & Qt::ShiftModifier || QApplication::keyboardModifiers() & Qt::ControlModifier; + if (!shiftOrControlPressed && !m_selectionMode) { m_oldSelection.clear(); } } @@ -1197,14 +1292,14 @@ void KItemListController::slotRubberBandChanged() // Select all visible items that intersect with the rubberband const auto widgets = m_view->visibleItemListWidgets(); - for (const KItemListWidget* widget : widgets) { + for (const KItemListWidget *widget : widgets) { const int index = widget->index(); const QRectF widgetRect = m_view->itemRect(index); if (widgetRect.intersects(rubberBandRect)) { - const QRectF iconRect = widget->iconRect().translated(widgetRect.topLeft()); - const QRectF textRect = widget->textRect().translated(widgetRect.topLeft()); - if (iconRect.intersects(rubberBandRect) || textRect.intersects(rubberBandRect)) { + // Select the full row intersecting with the rubberband rectangle + const QRectF selectionRect = widget->selectionRect().translated(widgetRect.topLeft()); + if (selectionRect.intersects(rubberBandRect)) { selectedItems.insert(index); } } @@ -1213,8 +1308,7 @@ void KItemListController::slotRubberBandChanged() // Select all invisible items that intersect with the rubberband. Instead of // iterating all items only the area which might be touched by the rubberband // will be checked. - const bool increaseIndex = scrollVertical ? - startPos.y() > endPos.y(): startPos.x() > endPos.x(); + const bool increaseIndex = scrollVertical ? startPos.y() > endPos.y() : startPos.x() > endPos.x(); int index = increaseIndex ? m_view->lastVisibleIndex() + 1 : m_view->firstVisibleIndex() - 1; bool selectionFinished = false; @@ -1226,25 +1320,22 @@ void KItemListController::slotRubberBandChanged() if (increaseIndex) { ++index; - selectionFinished = (index >= m_model->count()) || - ( scrollVertical && widgetRect.top() > rubberBandRect.bottom()) || - (!scrollVertical && widgetRect.left() > rubberBandRect.right()); + selectionFinished = (index >= m_model->count()) || (scrollVertical && widgetRect.top() > rubberBandRect.bottom()) + || (!scrollVertical && widgetRect.left() > rubberBandRect.right()); } else { --index; - selectionFinished = (index < 0) || - ( scrollVertical && widgetRect.bottom() < rubberBandRect.top()) || - (!scrollVertical && widgetRect.right() < rubberBandRect.left()); + selectionFinished = (index < 0) || (scrollVertical && widgetRect.bottom() < rubberBandRect.top()) + || (!scrollVertical && widgetRect.right() < rubberBandRect.left()); } } while (!selectionFinished); - if (QApplication::keyboardModifiers() & Qt::ControlModifier) { + if ((QApplication::keyboardModifiers() & Qt::ControlModifier) || m_selectionMode) { // If Control is pressed, the selection state of all items in the rubberband is toggled. // Therefore, the new selection contains: // 1. All previously selected items which are not inside the rubberband, and // 2. all items inside the rubberband which have not been selected previously. m_selectionManager->setSelectedItems(m_oldSelection ^ selectedItems); - } - else { + } else { m_selectionManager->setSelectedItems(selectedItems + m_oldSelection); } } @@ -1260,14 +1351,15 @@ void KItemListController::startDragging() return; } - QMimeData* data = m_model->createMimeData(selectedItems); + QMimeData *data = m_model->createMimeData(selectedItems); if (!data) { return; } + KUrlMimeData::exportUrlsToPortal(data); // The created drag object will be owned and deleted // by QApplication::activeWindow(). - QDrag* drag = new QDrag(QApplication::activeWindow()); + QDrag *drag = new QDrag(QApplication::activeWindow()); drag->setMimeData(data); const QPixmap pixmap = m_view->createDragPixmap(selectedItems); @@ -1282,12 +1374,12 @@ void KItemListController::startDragging() QAccessible::updateAccessibility(&accessibilityEvent); } -KItemListWidget* KItemListController::hoveredWidget() const +KItemListWidget *KItemListController::hoveredWidget() const { Q_ASSERT(m_view); const auto widgets = m_view->visibleItemListWidgets(); - for (KItemListWidget* widget : widgets) { + for (KItemListWidget *widget : widgets) { if (widget->isHovered()) { return widget; } @@ -1296,17 +1388,29 @@ KItemListWidget* KItemListController::hoveredWidget() const return nullptr; } -KItemListWidget* KItemListController::widgetForPos(const QPointF& pos) const +KItemListWidget *KItemListController::widgetForPos(const QPointF &pos) const { Q_ASSERT(m_view); const auto widgets = m_view->visibleItemListWidgets(); - for (KItemListWidget* widget : widgets) { + for (KItemListWidget *widget : widgets) { const QPointF mappedPos = widget->mapFromItem(m_view, pos); + if (widget->contains(mappedPos) || widget->selectionRect().contains(mappedPos)) { + return widget; + } + } + + return nullptr; +} - const bool hovered = widget->contains(mappedPos) && - !widget->expansionToggleRect().contains(mappedPos); - if (hovered) { +KItemListWidget *KItemListController::widgetForDropPos(const QPointF &pos) const +{ + Q_ASSERT(m_view); + + const auto widgets = m_view->visibleItemListWidgets(); + for (KItemListWidget *widget : widgets) { + const QPointF mappedPos = widget->mapFromItem(m_view, pos); + if (widget->contains(mappedPos)) { return widget; } } @@ -1316,9 +1420,8 @@ KItemListWidget* KItemListController::widgetForPos(const QPointF& pos) const void KItemListController::updateKeyboardAnchor() { - const bool validAnchor = m_keyboardAnchorIndex >= 0 && - m_keyboardAnchorIndex < m_model->count() && - keyboardAnchorPos(m_keyboardAnchorIndex) == m_keyboardAnchorPos; + const bool validAnchor = + m_keyboardAnchorIndex >= 0 && m_keyboardAnchorIndex < m_model->count() && keyboardAnchorPos(m_keyboardAnchorIndex) == m_keyboardAnchorPos; if (!validAnchor) { const int index = m_selectionManager->currentItem(); m_keyboardAnchorIndex = index; @@ -1417,9 +1520,9 @@ void KItemListController::updateExtendedSelectionRegion() } } -bool KItemListController::onPress(const QPoint& screenPos, const QPointF& pos, const Qt::KeyboardModifiers modifiers, const Qt::MouseButtons buttons) +bool KItemListController::onPress(const QPoint &screenPos, const QPointF &pos, const Qt::KeyboardModifiers modifiers, const Qt::MouseButtons buttons) { - emit mouseButtonPressed(m_pressedIndex, buttons); + Q_EMIT mouseButtonPressed(m_pressedIndex.value_or(-1), buttons); if (buttons & (Qt::BackButton | Qt::ForwardButton)) { // Do not select items when clicking the back/forward buttons, see @@ -1427,26 +1530,31 @@ bool KItemListController::onPress(const QPoint& screenPos, const QPointF& pos, c return true; } - if (m_view->isAboveExpansionToggle(m_pressedIndex, m_pressedMousePos)) { + const QPointF pressedMousePos = m_view->transform().map(pos); + + if (m_view->isAboveExpansionToggle(m_pressedIndex.value_or(-1), pressedMousePos)) { m_selectionManager->endAnchoredSelection(); - m_selectionManager->setCurrentItem(m_pressedIndex); - m_selectionManager->beginAnchoredSelection(m_pressedIndex); + m_selectionManager->setCurrentItem(m_pressedIndex.value()); + m_selectionManager->beginAnchoredSelection(m_pressedIndex.value()); return true; } - m_selectionTogglePressed = m_view->isAboveSelectionToggle(m_pressedIndex, m_pressedMousePos); + m_selectionTogglePressed = m_view->isAboveSelectionToggle(m_pressedIndex.value_or(-1), pressedMousePos); if (m_selectionTogglePressed) { - m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Toggle); + m_selectionManager->setSelected(m_pressedIndex.value(), 1, KItemListSelectionManager::Toggle); // The previous anchored selection has been finished already in // KItemListSelectionManager::setSelected(). We can safely change // the current item and start a new anchored selection now. - m_selectionManager->setCurrentItem(m_pressedIndex); - m_selectionManager->beginAnchoredSelection(m_pressedIndex); + m_selectionManager->setCurrentItem(m_pressedIndex.value()); + m_selectionManager->beginAnchoredSelection(m_pressedIndex.value()); return true; } const bool shiftPressed = modifiers & Qt::ShiftModifier; - const bool controlPressed = modifiers & Qt::ControlModifier; + const bool controlPressed = (modifiers & Qt::ControlModifier) || m_selectionMode; // Keeping selectionMode similar to pressing control will hopefully + // simplify the overall logic and possibilities both for users and devs. + const bool leftClick = buttons & Qt::LeftButton; + const bool rightClick = buttons & Qt::RightButton; // The previous selection is cleared if either // 1. The selection mode is SingleSelection, or @@ -1456,12 +1564,40 @@ bool KItemListController::onPress(const QPoint& screenPos, const QPointF& pos, c // - start dragging multiple items, or // - open the context menu and perform an action for all selected items. const bool shiftOrControlPressed = shiftPressed || controlPressed; - const bool pressedItemAlreadySelected = m_pressedIndex >= 0 && m_selectionManager->isSelected(m_pressedIndex); - const bool clearSelection = m_selectionBehavior == SingleSelection || - (!shiftOrControlPressed && !pressedItemAlreadySelected); + const bool pressedItemAlreadySelected = m_pressedIndex.has_value() && m_selectionManager->isSelected(m_pressedIndex.value()); + const bool clearSelection = m_selectionBehavior == SingleSelection || (!shiftOrControlPressed && !pressedItemAlreadySelected); + + // When this method returns false, a rubberBand selection is created using KItemListController::startRubberBand via the caller. if (clearSelection) { + const int selectedItemsCount = m_selectionManager->selectedItems().count(); m_selectionManager->clearSelection(); - } else if (pressedItemAlreadySelected && !shiftOrControlPressed && (buttons & Qt::LeftButton)) { + // clear and bail when we got an existing multi-selection + if (selectedItemsCount > 1 && m_pressedIndex.has_value()) { + const auto row = m_view->m_visibleItems.value(m_pressedIndex.value()); + const auto mappedPos = row->mapFromItem(m_view, pos); + if (pressedItemAlreadySelected || row->iconRect().contains(mappedPos) || row->textRect().contains(mappedPos)) { + // we are indeed inside the text/icon rect, keep m_pressedIndex what it is + // and short-circuit for single-click activation (it will then propagate to onRelease and activate the item) + // or we just keep going for double-click activation + if (m_view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick) || m_singleClickActivationEnforced) { + if (!pressedItemAlreadySelected) { + // An unselected item was clicked directly while deselecting multiple other items so we select it. + m_selectionManager->setSelected(m_pressedIndex.value(), 1, KItemListSelectionManager::Toggle); + m_selectionManager->setCurrentItem(m_pressedIndex.value()); + m_selectionManager->beginAnchoredSelection(m_pressedIndex.value()); + } + return true; // event handled, don't create rubber band + } + } else { + // we're not inside the text/icon rect, as we've already cleared the selection + // we can just stop here and make sure handlers down the line (i.e. onRelease) don't activate + m_pressedIndex.reset(); + // we don't stop event propagation and proceed to create a rubber band and let onRelease + // decide (based on m_pressedIndex) whether we're in a drag (drag => new rubber band, click => don't select the item) + return false; + } + } + } else if (pressedItemAlreadySelected && !shiftOrControlPressed && leftClick) { // The user might want to start dragging multiple items, but if he clicks the item // in order to trigger it instead, the other selected items must be deselected. // However, we do not know yet what the user is going to do. @@ -1469,8 +1605,8 @@ bool KItemListController::onPress(const QPoint& screenPos, const QPointF& pos, c // clear the selection in mouseReleaseEvent(), unless the items are dragged. m_clearSelectionIfItemsAreNotDragged = true; - if (m_selectionManager->selectedItems().count() == 1 && m_view->isAboveText(m_pressedIndex, m_pressedMousePos)) { - emit selectedItemTextPressed(m_pressedIndex); + if (m_selectionManager->selectedItems().count() == 1 && m_view->isAboveText(m_pressedIndex.value_or(-1), pressedMousePos)) { + Q_EMIT selectedItemTextPressed(m_pressedIndex.value_or(-1)); } } @@ -1479,9 +1615,15 @@ bool KItemListController::onPress(const QPoint& screenPos, const QPointF& pos, c m_selectionManager->endAnchoredSelection(); } - if (buttons & Qt::RightButton) { + if (rightClick) { + // Do header hit check and short circuit before commencing any state changing effects + if (m_view->headerBoundaries().contains(pos)) { + Q_EMIT headerContextMenuRequested(screenPos); + return true; + } + // Stop rubber band from persisting after right-clicks - KItemListRubberBand* rubberBand = m_view->rubberBand(); + KItemListRubberBand *rubberBand = m_view->rubberBand(); if (rubberBand->isActive()) { disconnect(rubberBand, &KItemListRubberBand::endPositionChanged, this, &KItemListController::slotRubberBandChanged); rubberBand->setActive(false); @@ -1489,25 +1631,56 @@ bool KItemListController::onPress(const QPoint& screenPos, const QPointF& pos, c } } - if (m_pressedIndex >= 0) { - m_selectionManager->setCurrentItem(m_pressedIndex); + if (m_pressedIndex.has_value()) { + // The hover highlight area of an item is being pressed. + m_selectionManager->setCurrentItem(m_pressedIndex.value()); + const auto row = m_view->m_visibleItems.value(m_pressedIndex.value()); // anything outside of row.contains() will be the empty region of the row rect + const bool hitTargetIsRowEmptyRegion = !row->contains(row->mapFromItem(m_view, pos)); + // again, when this method returns false, a rubberBand selection is created as the event is not consumed; + // createRubberBand here tells us whether to return true or false. + bool createRubberBand = (hitTargetIsRowEmptyRegion && m_selectionManager->selectedItems().isEmpty()); + + if (rightClick && hitTargetIsRowEmptyRegion) { + // We have a right click outside the icon and text rect but within the hover highlight area + // but it is unclear if this means that a selection rectangle for an item was clicked or the background of the view. + if (m_selectionManager->selectedItems().contains(m_pressedIndex.value())) { + // The selection rectangle for an item was clicked + Q_EMIT itemContextMenuRequested(m_pressedIndex.value(), screenPos); + } else { + row->setHovered(false); // Removes the hover highlight so the context menu doesn't look like it applies to the row. + Q_EMIT viewContextMenuRequested(screenPos); + } + return true; + } switch (m_selectionBehavior) { case NoSelection: break; case SingleSelection: - m_selectionManager->setSelected(m_pressedIndex); + m_selectionManager->setSelected(m_pressedIndex.value()); break; case MultiSelection: - if (controlPressed && !shiftPressed) { - m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Toggle); - m_selectionManager->beginAnchoredSelection(m_pressedIndex); + if (controlPressed && !shiftPressed && leftClick) { + // A left mouse button press is happening on an item while control is pressed. This either means a user wants to: + // - toggle the selection of item(s) or + // - they want to begin a drag on the item(s) to copy them. + // We rule out the latter, if the item is not clicked directly and was unselected previously. + const auto row = m_view->m_visibleItems.value(m_pressedIndex.value()); + const auto mappedPos = row->mapFromItem(m_view, pos); + if (!row->iconRect().contains(mappedPos) && !row->textRect().contains(mappedPos) && !pressedItemAlreadySelected) { + createRubberBand = true; + } else { + m_selectionManager->setSelected(m_pressedIndex.value(), 1, KItemListSelectionManager::Toggle); + m_selectionManager->beginAnchoredSelection(m_pressedIndex.value()); + createRubberBand = false; // multi selection, don't propagate any further + // This will be the start of an item drag-to-copy operation if the user now moves the mouse before releasing the mouse button. + } } else if (!shiftPressed || !m_selectionManager->isAnchoredSelectionActive()) { // Select the pressed item and start a new anchored selection - m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Select); - m_selectionManager->beginAnchoredSelection(m_pressedIndex); + m_selectionManager->setSelected(m_pressedIndex.value(), 1, KItemListSelectionManager::Select); + m_selectionManager->beginAnchoredSelection(m_pressedIndex.value()); } break; @@ -1516,92 +1689,111 @@ bool KItemListController::onPress(const QPoint& screenPos, const QPointF& pos, c break; } - if (buttons & Qt::RightButton) { - emit itemContextMenuRequested(m_pressedIndex, screenPos); + if (rightClick) { + Q_EMIT itemContextMenuRequested(m_pressedIndex.value(), screenPos); } - - return true; + return !createRubberBand; } - if (buttons & Qt::RightButton) { - const QRectF headerBounds = m_view->headerBoundaries(); - if (headerBounds.contains(pos)) { - emit headerContextMenuRequested(screenPos); - } else { - emit viewContextMenuRequested(screenPos); - } + if (rightClick) { + // header right click handling would have been done before this so just normal context + // menu here is fine + Q_EMIT viewContextMenuRequested(screenPos); return true; } return false; } -bool KItemListController::onRelease(const QPointF& pos, const Qt::KeyboardModifiers modifiers, const Qt::MouseButtons buttons, bool touch) +bool KItemListController::onRelease(const QPointF &pos, const Qt::KeyboardModifiers modifiers, const Qt::MouseButtons buttons, bool touch) { - const bool isAboveSelectionToggle = m_view->isAboveSelectionToggle(m_pressedIndex, m_pressedMousePos); + const QPointF pressedMousePos = pos; + const bool isAboveSelectionToggle = m_view->isAboveSelectionToggle(m_pressedIndex.value_or(-1), pressedMousePos); if (isAboveSelectionToggle) { m_selectionTogglePressed = false; return true; } if (!isAboveSelectionToggle && m_selectionTogglePressed) { - m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Toggle); + m_selectionManager->setSelected(m_pressedIndex.value_or(-1), 1, KItemListSelectionManager::Toggle); m_selectionTogglePressed = false; return true; } - const bool shiftOrControlPressed = modifiers & Qt::ShiftModifier || - modifiers & Qt::ControlModifier; + const bool controlPressed = modifiers & Qt::ControlModifier; + const bool shiftOrControlPressed = modifiers & Qt::ShiftModifier || controlPressed; + + const std::optional index = m_view->itemAt(pos); - KItemListRubberBand* rubberBand = m_view->rubberBand(); + KItemListRubberBand *rubberBand = m_view->rubberBand(); + bool rubberBandRelease = false; if (rubberBand->isActive()) { disconnect(rubberBand, &KItemListRubberBand::endPositionChanged, this, &KItemListController::slotRubberBandChanged); rubberBand->setActive(false); m_oldSelection.clear(); m_view->setAutoScroll(false); + rubberBandRelease = true; + // We check for actual rubber band drag here: if delta between start and end is less than drag threshold, + // then we have a single click on one of the rows + if ((rubberBand->endPosition() - rubberBand->startPosition()).manhattanLength() < QApplication::startDragDistance()) { + rubberBandRelease = false; // since we're only selecting, unmark rubber band release flag + // m_pressedIndex will have no value if we came from a multi-selection clearing onPress + // in that case, we don't select anything + if (index.has_value() && m_pressedIndex.has_value()) { + if (controlPressed && m_selectionBehavior == MultiSelection) { + m_selectionManager->setSelected(m_pressedIndex.value(), 1, KItemListSelectionManager::Toggle); + } else { + m_selectionManager->setSelected(index.value()); + } + if (!m_selectionManager->isAnchoredSelectionActive()) { + m_selectionManager->beginAnchoredSelection(index.value()); + } + } + } } - const int index = m_view->itemAt(pos); - - if (index >= 0 && index == m_pressedIndex) { + if (index.has_value() && index == m_pressedIndex) { // The release event is done above the same item as the press event if (m_clearSelectionIfItemsAreNotDragged) { // A selected item has been clicked, but no drag operation has been started // -> clear the rest of the selection. m_selectionManager->clearSelection(); - m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Select); - m_selectionManager->beginAnchoredSelection(m_pressedIndex); + m_selectionManager->setSelected(m_pressedIndex.value(), 1, KItemListSelectionManager::Select); + m_selectionManager->beginAnchoredSelection(m_pressedIndex.value()); } if (buttons & Qt::LeftButton) { bool emitItemActivated = true; - if (m_view->isAboveExpansionToggle(index, pos)) { - const bool expanded = m_model->isExpanded(index); - m_model->setExpanded(index, !expanded); + if (m_view->isAboveExpansionToggle(index.value(), pos)) { + const bool expanded = m_model->isExpanded(index.value()); + m_model->setExpanded(index.value(), !expanded); - emit itemExpansionToggleClicked(index); + Q_EMIT itemExpansionToggleClicked(index.value()); emitItemActivated = false; - } else if (shiftOrControlPressed) { - // The mouse click should only update the selection, not trigger the item + } else if (shiftOrControlPressed && m_selectionBehavior != SingleSelection) { + // The mouse click should only update the selection, not trigger the item, except when + // we are in single selection mode emitItemActivated = false; - } else if (!(m_view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick) || m_singleClickActivationEnforced)) { - if (touch) { - emitItemActivated = true; + } else { + const bool singleClickActivation = m_view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick) || m_singleClickActivationEnforced; + if (!singleClickActivation) { + emitItemActivated = touch && !m_selectionMode; } else { - emitItemActivated = false; + // activate on single click only if we didn't come from a rubber band release + emitItemActivated = !rubberBandRelease; } } if (emitItemActivated) { - emit itemActivated(index); + Q_EMIT itemActivated(index.value()); } } else if (buttons & Qt::MiddleButton) { - emit itemMiddleClicked(index); + Q_EMIT itemMiddleClicked(index.value()); } } - m_pressedMousePos = QPointF(); - m_pressedIndex = -1; + m_pressedMouseGlobalPos = QPointF(); + m_pressedIndex = std::nullopt; m_clearSelectionIfItemsAreNotDragged = false; return false; } @@ -1609,20 +1801,15 @@ bool KItemListController::onRelease(const QPointF& pos, const Qt::KeyboardModifi void KItemListController::startRubberBand() { if (m_selectionBehavior == MultiSelection) { - QPointF startPos = m_pressedMousePos; + QPoint startPos = m_view->transform().map(m_view->scene()->views().first()->mapFromGlobal(m_pressedMouseGlobalPos.toPoint())); if (m_view->scrollOrientation() == Qt::Vertical) { startPos.ry() += m_view->scrollOffset(); - if (m_view->itemSize().width() < 0) { - // Use a special rubberband for views that have only one column and - // expand the rubberband to use the whole width of the view. - startPos.setX(0); - } } else { startPos.rx() += m_view->scrollOffset(); } m_oldSelection = m_selectionManager->selectedItems(); - KItemListRubberBand* rubberBand = m_view->rubberBand(); + KItemListRubberBand *rubberBand = m_view->rubberBand(); rubberBand->setStartPosition(startPos); rubberBand->setEndPosition(startPos); rubberBand->setActive(true); @@ -1639,3 +1826,5 @@ void KItemListController::slotStateChanged(QScroller::State newState) m_scrollerIsScrolling = false; } } + +#include "moc_kitemlistcontroller.cpp"