Differential D12162 Diff 32154 src/kitemviews/kitemlistcontroller.cpp

Changeset View

Standalone View

View Options

src/kitemviews/kitemlistcontroller.cpp

Show All 37 Lines
38#include <QMimeData> 38​#include <QMimeData>
39#include <QTimer> 39​#include <QTimer>
40 40​
41KItemListController::KItemListController(KItemModelBase* model, KItemListView* view, QObject* parent) : 41​KItemListController::KItemListController(KItemModelBase* model, KItemListView* view, QObject* parent) :
42 QObject(parent), 42​ QObject(parent),
43 m_singleClickActivationEnforced(false), 43​ m_singleClickActivationEnforced(false),
44 m_selectionTogglePressed(false), 44​ m_selectionTogglePressed(false),
45 m_clearSelectionIfItemsAreNotDragged(false), 45​ m_clearSelectionIfItemsAreNotDragged(false),
46​ m_touchScrollOccured(false),
47​ m_touchDoubleClickInProgress(false),
46 m_selectionBehavior(NoSelection), 48​ m_selectionBehavior(NoSelection),
47 m_autoActivationBehavior(ActivationAndExpansion), 49​ m_autoActivationBehavior(ActivationAndExpansion),
48 m_mouseDoubleClickAction(ActivateItemOnly), 50​ m_mouseDoubleClickAction(ActivateItemOnly),
49 m_model(nullptr), 51​ m_model(nullptr),
50 m_view(nullptr), 52​ m_view(nullptr),
51 m_selectionManager(new KItemListSelectionManager(this)), 53​ m_selectionManager(new KItemListSelectionManager(this)),
52 m_keyboardManager(new KItemListKeyboardSearchManager(this)), 54​ m_keyboardManager(new KItemListKeyboardSearchManager(this)),
53 m_pressedIndex(-1), 55​ m_pressedIndex(-1),
54 m_pressedMousePos(), 56​ m_pressedMousePos(),
55 m_autoActivationTimer(nullptr), 57​ m_autoActivationTimer(nullptr),
56 m_oldSelection(), 58​ m_oldSelection(),
57 m_keyboardAnchorIndex(-1), 59​ m_keyboardAnchorIndex(-1),
58 m_keyboardAnchorPos(0) 60​ m_keyboardAnchorPos(0)
59{ 61​{
60 connect(m_keyboardManager, &KItemListKeyboardSearchManager::changeCurrentItem, 62​ connect(m_keyboardManager, &KItemListKeyboardSearchManager::changeCurrentItem,
61 this, &KItemListController::slotChangeCurrentItem); 63​ this, &KItemListController::slotChangeCurrentItem);
62 connect(m_selectionManager, &KItemListSelectionManager::currentChanged, 64​ connect(m_selectionManager, &KItemListSelectionManager::currentChanged,
63 m_keyboardManager, &KItemListKeyboardSearchManager::slotCurrentChanged); 65​ m_keyboardManager, &KItemListKeyboardSearchManager::slotCurrentChanged);
64 66​
65 m_autoActivationTimer = new QTimer(this); 67​ m_autoActivationTimer = new QTimer(this);
66 m_autoActivationTimer->setSingleShot(true); 68​ m_autoActivationTimer->setSingleShot(true);
67 m_autoActivationTimer->setInterval(-1); 69​ m_autoActivationTimer->setInterval(-1);
68 connect(m_autoActivationTimer, &QTimer::timeout, this, &KItemListController::slotAutoActivationTimeout); 70​ connect(m_autoActivationTimer, &QTimer::timeout, this, &KItemListController::slotAutoActivationTimeout);
69 71​
72​ m_touchDoubleClickTimer.setSingleShot(true);
73​ connect(&m_touchDoubleClickTimer, &QTimer::timeout, [this]() {
elvisangelaccioAuthorUnsubmitted
Not Done

Please add this as receiver, otherwise this connection can lead to crashes.

elvisangelaccio: Please add `this` as receiver, otherwise this connection can lead to crashes.
abalajiUnsubmitted
Not Done

I'm sorry can you elaborate on this a little bit?

abalaji: I'm sorry can you elaborate on this a little bit?
elvisangelaccioAuthorUnsubmitted
Not Done

Basically Qt could call the lambda slot after the object has been already destroyed.

More details here: https://medium.com/genymobile/how-c-lambda-expressions-can-improve-your-qt-code-8cd524f4ed9f

elvisangelaccio: Basically Qt could call the lambda slot after the object has been already destroyed. More…
abalajiUnsubmitted
Not Done

Ahh, of course! This makes so much sense. I've experienced weird crashes with connect and lambda's before and never knew this was a thing. Thanks for pointing it out!

abalaji: Ahh, of course! This makes so much sense. I've experienced weird crashes with `connect` and…
74​ m_touchDoubleClickInProgress = false;
75​ });
70 setModel(model); 76​ setModel(model);
71 setView(view); 77​ setView(view);
72} 78​}
73 79​
74KItemListController::~KItemListController() 80​KItemListController::~KItemListController()
75{ 81​{
76 setView(nullptr); 82​ setView(nullptr);
77 Q_ASSERT(!m_view); 83​ Q_ASSERT(!m_view);
▲ Show 20 Lines • Show All 462 Lines • ▼ Show 20 Line(s)
540bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const QTransform& transform) 546​bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const QTransform& transform)
541{ 547​{
542 if (!m_view) { 548​ if (!m_view) {
543 return false; 549​ return false;
544 } 550​ }
545 551​
546 m_pressedMousePos = transform.map(event->pos()); 552​ m_pressedMousePos = transform.map(event->pos());
547 m_pressedIndex = m_view->itemAt(m_pressedMousePos); 553​ m_pressedIndex = m_view->itemAt(m_pressedMousePos);
548 emit mouseButtonPressed(m_pressedIndex, event->buttons()); 554​ const Qt::MouseButtons buttons = event->buttons();
555​ emit mouseButtonPressed(m_pressedIndex, buttons);
549 556​
550 if (event->buttons() & (Qt::BackButton | Qt::ForwardButton)) { 557​ if (buttons & (Qt::BackButton | Qt::ForwardButton)) {
551 // Do not select items when clicking the back/forward buttons, see 558​ // Do not select items when clicking the back/forward buttons, see
552 // https://bugs.kde.org/show_bug.cgi?id=327412. 559​ // https://bugs.kde.org/show_bug.cgi?id=327412.
553 return true; 560​ return true;
554 } 561​ }
555 562​
556 if (m_view->isAboveExpansionToggle(m_pressedIndex, m_pressedMousePos)) { 563​ if (!onPress(event->screenPos(), event->modifiers(), buttons)) {
557 m_selectionManager->endAnchoredSelection(); ​
558 m_selectionManager->setCurrentItem(m_pressedIndex); ​
559 m_selectionManager->beginAnchoredSelection(m_pressedIndex); ​
560 return true; ​
561 } ​
562 ​
563 m_selectionTogglePressed = m_view->isAboveSelectionToggle(m_pressedIndex, m_pressedMousePos); ​
564 if (m_selectionTogglePressed) { ​
565 m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Toggle); ​
566 // The previous anchored selection has been finished already in ​
567 // KItemListSelectionManager::setSelected(). We can safely change ​
568 // the current item and start a new anchored selection now. ​
569 m_selectionManager->setCurrentItem(m_pressedIndex); ​
570 m_selectionManager->beginAnchoredSelection(m_pressedIndex); ​
571 return true; ​
572 } ​
573 ​
574 const bool shiftPressed = event->modifiers() & Qt::ShiftModifier; ​
575 const bool controlPressed = event->modifiers() & Qt::ControlModifier; ​
576 ​
577 // The previous selection is cleared if either ​
578 // 1. The selection mode is SingleSelection, or ​
579 // 2. the selection mode is MultiSelection, and *none* of the following conditions are met: ​
580 // a) Shift or Control are pressed. ​
581 // b) The clicked item is selected already. In that case, the user might want to: ​
582 // - start dragging multiple items, or ​
583 // - open the context menu and perform an action for all selected items. ​
584 const bool shiftOrControlPressed = shiftPressed || controlPressed; ​
585 const bool pressedItemAlreadySelected = m_pressedIndex >= 0 && m_selectionManager->isSelected(m_pressedIndex); ​
586 const bool clearSelection = m_selectionBehavior == SingleSelection || ​
587 (!shiftOrControlPressed && !pressedItemAlreadySelected); ​
588 if (clearSelection) { ​
589 m_selectionManager->clearSelection(); ​
590 } else if (pressedItemAlreadySelected && !shiftOrControlPressed && (event->buttons() & Qt::LeftButton)) { ​
591 // The user might want to start dragging multiple items, but if he clicks the item ​
592 // in order to trigger it instead, the other selected items must be deselected. ​
593 // However, we do not know yet what the user is going to do. ​
594 // -> remember that the user pressed an item which had been selected already and ​
595 // clear the selection in mouseReleaseEvent(), unless the items are dragged. ​
596 m_clearSelectionIfItemsAreNotDragged = true; ​
597 ​
598 if (m_selectionManager->selectedItems().count() == 1 && m_view->isAboveText(m_pressedIndex, m_pressedMousePos)) { ​
599 emit selectedItemTextPressed(m_pressedIndex); ​
600 } ​
601 } ​
602 ​
603 if (!shiftPressed) { ​
604 // Finish the anchored selection before the current index is changed ​
605 m_selectionManager->endAnchoredSelection(); ​
606 } ​
607 ​
608 if (m_pressedIndex >= 0) { ​
609 m_selectionManager->setCurrentItem(m_pressedIndex); ​
610 ​
611 switch (m_selectionBehavior) { ​
612 case NoSelection: ​
613 break; ​
614 ​
615 case SingleSelection: ​
616 m_selectionManager->setSelected(m_pressedIndex); ​
617 break; ​
618 ​
619 case MultiSelection: ​
620 if (controlPressed && !shiftPressed) { ​
621 m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Toggle); ​
622 m_selectionManager->beginAnchoredSelection(m_pressedIndex); ​
623 } else if (!shiftPressed || !m_selectionManager->isAnchoredSelectionActive()) { ​
624 // Select the pressed item and start a new anchored selection ​
625 m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Select); ​
626 m_selectionManager->beginAnchoredSelection(m_pressedIndex); ​
627 } ​
628 break; ​
629 ​
630 default: ​
631 Q_ASSERT(false); ​
632 break; ​
633 } ​
634 ​
635 if (event->buttons() & Qt::RightButton) { ​
636 emit itemContextMenuRequested(m_pressedIndex, event->screenPos()); ​
637 } ​
638 ​
639 return true; ​
640 } ​
641 ​
642 if (event->buttons() & Qt::RightButton) { ​
643 const QRectF headerBounds = m_view->headerBoundaries(); ​
644 if (headerBounds.contains(event->pos())) { ​
645 emit headerContextMenuRequested(event->screenPos()); ​
646 } else { ​
647 emit viewContextMenuRequested(event->screenPos()); ​
648 } ​
649 return true; ​
650 } ​
651 ​
652 if (m_selectionBehavior == MultiSelection) { 564​ if (m_selectionBehavior == MultiSelection) {
653 QPointF startPos = m_pressedMousePos; 565​ QPointF startPos = m_pressedMousePos;
654 if (m_view->scrollOrientation() == Qt::Vertical) { 566​ if (m_view->scrollOrientation() == Qt::Vertical) {
655 startPos.ry() += m_view->scrollOffset(); 567​ startPos.ry() += m_view->scrollOffset();
656 if (m_view->itemSize().width() < 0) { 568​ if (m_view->itemSize().width() < 0) {
657 // Use a special rubberband for views that have only one column and 569​ // Use a special rubberband for views that have only one column and
658 // expand the rubberband to use the whole width of the view. 570​ // expand the rubberband to use the whole width of the view.
659 startPos.setX(0); 571​ startPos.setX(0);
660 } 572​ }
661 } else { 573​ } else {
662 startPos.rx() += m_view->scrollOffset(); 574​ startPos.rx() += m_view->scrollOffset();
663 } 575​ }
664 576​
665 m_oldSelection = m_selectionManager->selectedItems(); 577​ m_oldSelection = m_selectionManager->selectedItems();
666 KItemListRubberBand* rubberBand = m_view->rubberBand(); 578​ KItemListRubberBand* rubberBand = m_view->rubberBand();
667 rubberBand->setStartPosition(startPos); 579​ rubberBand->setStartPosition(startPos);
668 rubberBand->setEndPosition(startPos); 580​ rubberBand->setEndPosition(startPos);
669 rubberBand->setActive(true); 581​ rubberBand->setActive(true);
670 connect(rubberBand, &KItemListRubberBand::endPositionChanged, this, &KItemListController::slotRubberBandChanged); 582​ connect(rubberBand, &KItemListRubberBand::endPositionChanged, this, &KItemListController::slotRubberBandChanged);
671 m_view->setAutoScroll(true); 583​ m_view->setAutoScroll(true);
672 } 584​ }
673 ​
674 return false; 585​ return false;
586​ } else {
587​ return true;
588​ }
675} 589​}
676 590​
677bool KItemListController::mouseMoveEvent(QGraphicsSceneMouseEvent* event, const QTransform& transform) 591​bool KItemListController::mouseMoveEvent(QGraphicsSceneMouseEvent* event, const QTransform& transform)
678{ 592​{
679 if (!m_view) { 593​ if (!m_view) {
680 return false; 594​ return false;
681 } 595​ }
682 596​
683 if (m_pressedIndex >= 0) { 597​ onMove(transform.map(event->pos()), event->buttons());
684 // Check whether a dragging should be started ​
685 if (event->buttons() & Qt::LeftButton) { ​
686 const QPointF pos = transform.map(event->pos()); ​
687 if ((pos - m_pressedMousePos).manhattanLength() >= QApplication::startDragDistance()) { ​
688 if (!m_selectionManager->isSelected(m_pressedIndex)) { ​
689 // Always assure that the dragged item gets selected. Usually this is already ​
690 // done on the mouse-press event, but when using the selection-toggle on a ​
691 // selected item the dragged item is not selected yet. ​
692 m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Toggle); ​
693 } else { ​
694 // A selected item has been clicked to drag all selected items ​
695 // -> the selection should not be cleared when the mouse button is released. ​
696 m_clearSelectionIfItemsAreNotDragged = false; ​
697 } ​
698 ​
699 startDragging(); ​
700 } ​
701 } ​
702 } else { ​
703 KItemListRubberBand* rubberBand = m_view->rubberBand(); ​
704 if (rubberBand->isActive()) { ​
705 QPointF endPos = transform.map(event->pos()); ​
706 ​
707 // Update the current item. ​
708 const int newCurrent = m_view->itemAt(endPos); ​
709 if (newCurrent >= 0) { ​
710 // It's expected that the new current index is also the new anchor (bug 163451). ​
711 m_selectionManager->endAnchoredSelection(); ​
712 m_selectionManager->setCurrentItem(newCurrent); ​
713 m_selectionManager->beginAnchoredSelection(newCurrent); ​
714 } ​
715 ​
716 if (m_view->scrollOrientation() == Qt::Vertical) { ​
717 endPos.ry() += m_view->scrollOffset(); ​
718 if (m_view->itemSize().width() < 0) { ​
719 // Use a special rubberband for views that have only one column and ​
720 // expand the rubberband to use the whole width of the view. ​
721 endPos.setX(m_view->size().width()); ​
722 } ​
723 } else { ​
724 endPos.rx() += m_view->scrollOffset(); ​
725 } ​
726 rubberBand->setEndPosition(endPos); ​
727 } ​
728 } ​
729 ​
730 return false; 598​ return false;
731} 599​}
732 600​
733bool KItemListController::mouseReleaseEvent(QGraphicsSceneMouseEvent* event, const QTransform& transform) 601​bool KItemListController::mouseReleaseEvent(QGraphicsSceneMouseEvent* event, const QTransform& transform)
734{ 602​{
735 if (!m_view) { 603​ if (!m_view) {
736 return false; 604​ return false;
737 } 605​ }
738 606​
739 emit mouseButtonReleased(m_pressedIndex, event->buttons()); 607​ emit mouseButtonReleased(m_pressedIndex, event->buttons());
740 608​
741 const bool isAboveSelectionToggle = m_view->isAboveSelectionToggle(m_pressedIndex, m_pressedMousePos); 609​ return onRelease(transform.map(event->pos()), event->modifiers(), event->button());
742 if (isAboveSelectionToggle) { ​
743 m_selectionTogglePressed = false; ​
744 return true; ​
745 } ​
746 ​
747 if (!isAboveSelectionToggle && m_selectionTogglePressed) { ​
748 m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Toggle); ​
749 m_selectionTogglePressed = false; ​
750 return true; ​
751 } ​
752 ​
753 const bool shiftOrControlPressed = event->modifiers() & Qt::ShiftModifier || ​
754 event->modifiers() & Qt::ControlModifier; ​
755 ​
756 KItemListRubberBand* rubberBand = m_view->rubberBand(); ​
757 if (rubberBand->isActive()) { ​
758 disconnect(rubberBand, &KItemListRubberBand::endPositionChanged, this, &KItemListController::slotRubberBandChanged); ​
759 rubberBand->setActive(false); ​
760 m_oldSelection.clear(); ​
761 m_view->setAutoScroll(false); ​
762 } ​
763 ​
764 const QPointF pos = transform.map(event->pos()); ​
765 const int index = m_view->itemAt(pos); ​
766 ​
767 if (index >= 0 && index == m_pressedIndex) { ​
768 // The release event is done above the same item as the press event ​
769 ​
770 if (m_clearSelectionIfItemsAreNotDragged) { ​
771 // A selected item has been clicked, but no drag operation has been started ​
772 // -> clear the rest of the selection. ​
773 m_selectionManager->clearSelection(); ​
774 m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Select); ​
775 m_selectionManager->beginAnchoredSelection(m_pressedIndex); ​
776 } ​
777 ​
778 if (event->button() & Qt::LeftButton) { ​
779 bool emitItemActivated = true; ​
780 if (m_view->isAboveExpansionToggle(index, pos)) { ​
781 const bool expanded = m_model->isExpanded(index); ​
782 m_model->setExpanded(index, !expanded); ​
783 ​
784 emit itemExpansionToggleClicked(index); ​
785 emitItemActivated = false; ​
786 } else if (shiftOrControlPressed) { ​
787 // The mouse click should only update the selection, not trigger the item ​
788 emitItemActivated = false; ​
789 } else if (!(m_view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick) || m_singleClickActivationEnforced)) { ​
790 emitItemActivated = false; ​
791 } ​
792 if (emitItemActivated) { ​
793 emit itemActivated(index); ​
794 } ​
795 } else if (event->button() & Qt::MidButton) { ​
796 emit itemMiddleClicked(index); ​
797 } ​
798 } ​
799 ​
800 m_pressedMousePos = QPointF(); ​
801 m_pressedIndex = -1; ​
802 m_clearSelectionIfItemsAreNotDragged = false; ​
803 return false; ​
804} 610​}
805 611​
806bool KItemListController::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event, const QTransform& transform) 612​bool KItemListController::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event, const QTransform& transform)
807{ 613​{
808 const QPointF pos = transform.map(event->pos()); 614​ const QPointF pos = transform.map(event->pos());
809 const int index = m_view->itemAt(pos); 615​ const int index = m_view->itemAt(pos);
810 616​
811 // Expand item if desired - See Bug 295573 617​ return onDoubleClick(pos, event->screenPos(), index, event->button());
812 if (m_mouseDoubleClickAction != ActivateItemOnly) { ​
813 if (m_view && m_model && m_view->supportsItemExpanding() && m_model->isExpandable(index)) { ​
814 const bool expanded = m_model->isExpanded(index); ​
815 m_model->setExpanded(index, !expanded); ​
816 } ​
817 } ​
818 ​
819 if (event->button() & Qt::RightButton) { ​
820 m_selectionManager->clearSelection(); ​
821 if (index >= 0) { ​
822 m_selectionManager->setSelected(index); ​
823 emit itemContextMenuRequested(index, event->screenPos()); ​
824 } else { ​
825 const QRectF headerBounds = m_view->headerBoundaries(); ​
826 if (headerBounds.contains(event->pos())) { ​
827 emit headerContextMenuRequested(event->screenPos()); ​
828 } else { ​
829 emit viewContextMenuRequested(event->screenPos()); ​
830 } ​
831 } ​
832 return true; ​
833 } ​
834 ​
835 bool emitItemActivated = !(m_view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick) || m_singleClickActivationEnforced) && ​
836 (event->button() & Qt::LeftButton) && ​
837 index >= 0 && index < m_model->count(); ​
838 if (emitItemActivated) { ​
839 emit itemActivated(index); ​
840 } ​
841 return false; ​
842} 618​}
843 619​
844bool KItemListController::dragEnterEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform) 620​bool KItemListController::dragEnterEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform)
845{ 621​{
846 Q_UNUSED(event); 622​ Q_UNUSED(event);
847 Q_UNUSED(transform); 623​ Q_UNUSED(transform);
848 624​
849 DragAndDropHelper::clearUrlListMatchesUrlCache(); 625​ DragAndDropHelper::clearUrlListMatchesUrlCache();
▲ Show 20 Lines • Show All 180 Lines • ▼ Show 20 Line(s)
1030 806​
1031bool KItemListController::resizeEvent(QGraphicsSceneResizeEvent* event, const QTransform& transform) 807​bool KItemListController::resizeEvent(QGraphicsSceneResizeEvent* event, const QTransform& transform)
1032{ 808​{
1033 Q_UNUSED(event); 809​ Q_UNUSED(event);
1034 Q_UNUSED(transform); 810​ Q_UNUSED(transform);
1035 return false; 811​ return false;
1036} 812​}
1037 813​
814​bool KItemListController::touchBeginEvent(QTouchEvent* event, const QTransform& transform)
815​{
816​ if (!m_view) {
817​ return false;
818​ }
819​
820​ const QTouchEvent::TouchPoint& touchPoint = event->touchPoints()[0];
821​
822​ m_pressedMousePos = transform.map(touchPoint.pos());
823​ m_pressedIndex = m_view->itemAt(m_pressedMousePos);
824​ onPress(touchPoint.screenPos().toPoint(), event->modifiers());
825​ return true;
826​}
827​
828​bool KItemListController::touchUpdateEvent(QTouchEvent* event, const QTransform& transform)
829​{
830​ if (!m_view) {
831​ return false;
832​ }
833​
834​ const auto touchState = event->touchPointStates();
835​
836​ if (event->touchPoints().length() > 1) {
837​ return true;
838​ }
839​ if (touchState & Qt::TouchPointMoved) {
840​ // mouse move
841​ m_touchScrollOccured = true;
842​// const QTouchEvent::TouchPoint& touchPoint = event->touchPoints()[0];
843​// onMove(transform.map(touchPoint.pos()), Qt::LeftButton);
844​ }
845​ return true;
846​}
847​
848​bool KItemListController::touchEndEvent(QTouchEvent* event, const QTransform& transform)
849​{
850​ if (!m_view) {
851​ return false;
852​ }
853​
854​ if (m_touchScrollOccured) {
855​ m_touchScrollOccured = false;
856​ return false;
857​ }
858​
859​ const QTouchEvent::TouchPoint& touchPoint = event->touchPoints()[0];
860​ const QPointF pos = transform.map(touchPoint.pos());
861​ const int index = m_view->itemAt(pos);
862​ if (m_touchDoubleClickInProgress) {
863​ if (
864​ (index >= 0 && index == m_touchDoubleClickStartIndex) ||
865​ (pos - m_touchDoubleClickStartPos).manhattanLength() < 20
866​ ) {
867​ onDoubleClick(pos, touchPoint.screenPos().toPoint(), m_pressedIndex, Qt::LeftButton);
868​ }
869​ } else {
870​ m_touchDoubleClickInProgress = true;
871​ }
872​ m_touchDoubleClickStartPos = pos;
873​ m_touchDoubleClickStartIndex = index;
874​ m_touchDoubleClickTimer.start(QApplication::doubleClickInterval());
875​ onRelease(pos, event->modifiers(), Qt::LeftButton);
876​ return false;
877​}
878​
1038bool KItemListController::processEvent(QEvent* event, const QTransform& transform) 879​bool KItemListController::processEvent(QEvent* event, const QTransform& transform)
1039{ 880​{
1040 if (!event) { 881​ if (!event) {
1041 return false; 882​ return false;
1042 } 883​ }
1043 884​
1044 switch (event->type()) { 885​ switch (event->type()) {
1045 case QEvent::KeyPress: 886​ case QEvent::KeyPress:
Show All 21 Lines
1067 case QEvent::GraphicsSceneHoverEnter: 908​ case QEvent::GraphicsSceneHoverEnter:
1068 return hoverEnterEvent(static_cast<QGraphicsSceneHoverEvent*>(event), QTransform()); 909​ return hoverEnterEvent(static_cast<QGraphicsSceneHoverEvent*>(event), QTransform());
1069 case QEvent::GraphicsSceneHoverMove: 910​ case QEvent::GraphicsSceneHoverMove:
1070 return hoverMoveEvent(static_cast<QGraphicsSceneHoverEvent*>(event), QTransform()); 911​ return hoverMoveEvent(static_cast<QGraphicsSceneHoverEvent*>(event), QTransform());
1071 case QEvent::GraphicsSceneHoverLeave: 912​ case QEvent::GraphicsSceneHoverLeave:
1072 return hoverLeaveEvent(static_cast<QGraphicsSceneHoverEvent*>(event), QTransform()); 913​ return hoverLeaveEvent(static_cast<QGraphicsSceneHoverEvent*>(event), QTransform());
1073 case QEvent::GraphicsSceneResize: 914​ case QEvent::GraphicsSceneResize:
1074 return resizeEvent(static_cast<QGraphicsSceneResizeEvent*>(event), transform); 915​ return resizeEvent(static_cast<QGraphicsSceneResizeEvent*>(event), transform);
916​ case QEvent::TouchBegin:
917​ return touchBeginEvent(static_cast<QTouchEvent*>(event), QTransform());
918​ case QEvent::TouchUpdate:
919​ return touchUpdateEvent(static_cast<QTouchEvent*>(event), QTransform());
920​ case QEvent::TouchEnd:
921​ return touchEndEvent(static_cast<QTouchEvent*>(event), QTransform());
1075 default: 922​ default:
1076 break; 923​ break;
1077 } 924​ }
1078 925​
1079 return false; 926​ return false;
1080} 927​}
1081 928​
1082void KItemListController::slotViewScrollOffsetChanged(qreal current, qreal previous) 929​void KItemListController::slotViewScrollOffsetChanged(qreal current, qreal previous)
▲ Show 20 Lines • Show All 264 Lines • ▼ Show 20 Line(s)1192 if (m_view) {
1347 KItemListStyleOption option = m_view->styleOption(); 1194​ KItemListStyleOption option = m_view->styleOption();
1348 if (option.extendedSelectionRegion != extend) { 1195​ if (option.extendedSelectionRegion != extend) {
1349 option.extendedSelectionRegion = extend; 1196​ option.extendedSelectionRegion = extend;
1350 m_view->setStyleOption(option); 1197​ m_view->setStyleOption(option);
1351 } 1198​ }
1352 } 1199​ }
1353} 1200​}
1354 1201​
1202​bool KItemListController::onPress(const QPoint& screenPos, const Qt::KeyboardModifiers modifiers, const Qt::MouseButtons buttons) {
1203​ if (m_view->isAboveExpansionToggle(m_pressedIndex, m_pressedMousePos)) {
1204​ m_selectionManager->endAnchoredSelection();
1205​ m_selectionManager->setCurrentItem(m_pressedIndex);
1206​ m_selectionManager->beginAnchoredSelection(m_pressedIndex);
1207​ return true;
1208​ }
1209​
1210​ m_selectionTogglePressed = m_view->isAboveSelectionToggle(m_pressedIndex, m_pressedMousePos);
1211​ if (m_selectionTogglePressed) {
1212​ m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Toggle);
1213​ // The previous anchored selection has been finished already in
1214​ // KItemListSelectionManager::setSelected(). We can safely change
1215​ // the current item and start a new anchored selection now.
1216​ m_selectionManager->setCurrentItem(m_pressedIndex);
1217​ m_selectionManager->beginAnchoredSelection(m_pressedIndex);
1218​ return true;
1219​ }
1220​
1221​ const bool shiftPressed = modifiers & Qt::ShiftModifier;
1222​ const bool controlPressed = modifiers & Qt::ControlModifier;
1223​
1224​ // The previous selection is cleared if either
1225​ // 1. The selection mode is SingleSelection, or
1226​ // 2. the selection mode is MultiSelection, and *none* of the following conditions are met:
1227​ // a) Shift or Control are pressed.
1228​ // b) The clicked item is selected already. In that case, the user might want to:
1229​ // - start dragging multiple items, or
1230​ // - open the context menu and perform an action for all selected items.
1231​ const bool shiftOrControlPressed = shiftPressed || controlPressed;
1232​ const bool pressedItemAlreadySelected = m_pressedIndex >= 0 && m_selectionManager->isSelected(m_pressedIndex);
1233​ const bool clearSelection = m_selectionBehavior == SingleSelection ||
1234​ (!shiftOrControlPressed && !pressedItemAlreadySelected);
1235​ if (clearSelection) {
1236​ m_selectionManager->clearSelection();
1237​ } else if (pressedItemAlreadySelected && !shiftOrControlPressed && (buttons & Qt::LeftButton)) {
1238​ // The user might want to start dragging multiple items, but if he clicks the item
1239​ // in order to trigger it instead, the other selected items must be deselected.
1240​ // However, we do not know yet what the user is going to do.
1241​ // -> remember that the user pressed an item which had been selected already and
1242​ // clear the selection in mouseReleaseEvent(), unless the items are dragged.
1243​ m_clearSelectionIfItemsAreNotDragged = true;
1244​
1245​ if (m_selectionManager->selectedItems().count() == 1 && m_view->isAboveText(m_pressedIndex, m_pressedMousePos)) {
1246​ emit selectedItemTextPressed(m_pressedIndex);
1247​ }
1248​ }
1249​
1250​ if (!shiftPressed) {
1251​ // Finish the anchored selection before the current index is changed
1252​ m_selectionManager->endAnchoredSelection();
1253​ }
1254​
1255​ if (m_pressedIndex >= 0) {
1256​ m_selectionManager->setCurrentItem(m_pressedIndex);
1257​
1258​ switch (m_selectionBehavior) {
1259​ case NoSelection:
1260​ break;
1261​
1262​ case SingleSelection:
1263​ m_selectionManager->setSelected(m_pressedIndex);
1264​ break;
1265​
1266​ case MultiSelection:
1267​ if (controlPressed && !shiftPressed) {
1268​ m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Toggle);
1269​ m_selectionManager->beginAnchoredSelection(m_pressedIndex);
1270​ } else if (!shiftPressed || !m_selectionManager->isAnchoredSelectionActive()) {
1271​ // Select the pressed item and start a new anchored selection
1272​ m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Select);
1273​ m_selectionManager->beginAnchoredSelection(m_pressedIndex);
1274​ }
1275​ break;
1276​
1277​ default:
1278​ Q_ASSERT(false);
1279​ break;
1280​ }
1281​
1282​ if (buttons & Qt::RightButton) {
1283​ emit itemContextMenuRequested(m_pressedIndex, screenPos);
1284​ }
1285​
1286​ return true;
1287​ }
1288​
1289​ if (buttons & Qt::RightButton) {
1290​ const QRectF headerBounds = m_view->headerBoundaries();
1291​ if (headerBounds.contains(m_pressedMousePos)) {
1292​ emit headerContextMenuRequested(screenPos);
1293​ } else {
1294​ emit viewContextMenuRequested(screenPos);
1295​ }
1296​ return true;
1297​ }
1298​
1299​ return false;
1300​}
1301​
1302​void KItemListController::onMove(const QPointF& pos, const Qt::MouseButtons buttons) {
1303​ if (m_pressedIndex >= 0) {
1304​ // Check whether a dragging should be started
1305​ if (buttons & Qt::LeftButton) {
1306​ if ((pos - m_pressedMousePos).manhattanLength() >= QApplication::startDragDistance()) {
1307​ if (!m_selectionManager->isSelected(m_pressedIndex)) {
1308​ // Always assure that the dragged item gets selected. Usually this is already
1309​ // done on the mouse-press event, but when using the selection-toggle on a
1310​ // selected item the dragged item is not selected yet.
1311​ m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Toggle);
1312​ } else {
1313​ // A selected item has been clicked to drag all selected items
1314​ // -> the selection should not be cleared when the mouse button is released.
1315​ m_clearSelectionIfItemsAreNotDragged = false;
1316​ }
1317​
1318​ startDragging();
1319​ }
1320​ }
1321​ } else {
1322​ KItemListRubberBand* rubberBand = m_view->rubberBand();
1323​ if (rubberBand->isActive()) {
1324​ // Update the current item.
1325​ QPointF endPos(pos);
1326​ const int newCurrent = m_view->itemAt(endPos);
1327​ if (newCurrent >= 0) {
1328​ // It's expected that the new current index is also the new anchor (bug 163451).
1329​ m_selectionManager->endAnchoredSelection();
1330​ m_selectionManager->setCurrentItem(newCurrent);
1331​ m_selectionManager->beginAnchoredSelection(newCurrent);
1332​ }
1333​
1334​ if (m_view->scrollOrientation() == Qt::Vertical) {
1335​ endPos.ry() += m_view->scrollOffset();
1336​ if (m_view->itemSize().width() < 0) {
1337​ // Use a special rubberband for views that have only one column and
1338​ // expand the rubberband to use the whole width of the view.
1339​ endPos.setX(m_view->size().width());
1340​ }
1341​ } else {
1342​ endPos.rx() += m_view->scrollOffset();
1343​ }
1344​ rubberBand->setEndPosition(endPos);
1345​ }
1346​ }
1347​}
1348​
1349​bool KItemListController::onRelease(const QPointF& pos, const Qt::KeyboardModifiers modifiers, const Qt::MouseButtons button) {
1350​ const bool isAboveSelectionToggle = m_view->isAboveSelectionToggle(m_pressedIndex, m_pressedMousePos);
1351​ if (isAboveSelectionToggle) {
1352​ m_selectionTogglePressed = false;
1353​ return true;
1354​ }
1355​
1356​ if (!isAboveSelectionToggle && m_selectionTogglePressed) {
1357​ m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Toggle);
1358​ m_selectionTogglePressed = false;
1359​ return true;
1360​ }
1361​
1362​ const bool shiftOrControlPressed = modifiers & Qt::ShiftModifier ||
1363​ modifiers & Qt::ControlModifier;
1364​
1365​ KItemListRubberBand* rubberBand = m_view->rubberBand();
1366​ if (rubberBand->isActive()) {
1367​ disconnect(rubberBand, &KItemListRubberBand::endPositionChanged, this, &KItemListController::slotRubberBandChanged);
1368​ rubberBand->setActive(false);
1369​ m_oldSelection.clear();
1370​ m_view->setAutoScroll(false);
1371​ }
1372​
1373​ const int index = m_view->itemAt(pos);
1374​
1375​ if (index >= 0 && index == m_pressedIndex) {
1376​ // The release event is done above the same item as the press event
1377​
1378​ if (m_clearSelectionIfItemsAreNotDragged) {
1379​ // A selected item has been clicked, but no drag operation has been started
1380​ // -> clear the rest of the selection.
1381​ m_selectionManager->clearSelection();
1382​ m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Select);
1383​ m_selectionManager->beginAnchoredSelection(m_pressedIndex);
1384​ }
1385​
1386​ if (button & Qt::LeftButton) {
1387​ if (m_view->isAboveExpansionToggle(index, pos)) {
1388​ const bool expanded = m_model->isExpanded(index);
1389​ m_model->setExpanded(index, !expanded);
1390​
1391​ emit itemExpansionToggleClicked(index);
1392​ } else if (
1393​ !shiftOrControlPressed && (
1394​ m_view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick) ||
1395​ m_singleClickActivationEnforced
1396​ )
1397​ ) {
1398​ emit itemActivated(index);
1399​ }
1400​ } else if (button & Qt::MidButton) {
1401​ emit itemMiddleClicked(index);
1402​ }
1403​ }
1404​
1405​ m_pressedMousePos = QPointF();
1406​ m_pressedIndex = -1;
1407​ m_clearSelectionIfItemsAreNotDragged = false;
anthonyfieroniUnsubmitted
Done

emitItemActivated increases complexity, so just remove it

if (m_view->isAboveExpansionToggle(index, pos)) {
    const bool expanded = m_model->isExpanded(index);
    m_model->setExpanded(index, !expanded);
    emit itemExpansionToggleClicked(index);
} else if (shiftOrControlPressed || m_singleClickActivationEnforced
|| !(m_view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick))) {
    // The mouse click should only update the selection, not trigger the item
} else {
    emit itemActivated(index);
}
anthonyfieroni: emitItemActivated increases complexity, so just remove it ``` if (m_view…
1408​ return false;
1409​}
1410​
1411​bool KItemListController::onDoubleClick(const QPointF& pos, const QPoint& screenPos, const int index, const Qt::MouseButton button)
1412​{
1413​ // Expand item if desired - See Bug 295573
1414​ if (m_mouseDoubleClickAction != ActivateItemOnly) {
1415​ if (m_view && m_model && m_view->supportsItemExpanding() && m_model->isExpandable(index)) {
1416​ const bool expanded = m_model->isExpanded(index);
1417​ m_model->setExpanded(index, !expanded);
1418​ }
1419​ }
1420​
1421​ if (button & Qt::RightButton) {
1422​ m_selectionManager->clearSelection();
1423​ if (index >= 0) {
1424​ m_selectionManager->setSelected(index);
1425​ emit itemContextMenuRequested(index, screenPos);
1426​ } else {
1427​ const QRectF headerBounds = m_view->headerBoundaries();
1428​ if (headerBounds.contains(pos)) {
1429​ emit headerContextMenuRequested(screenPos);
1430​ } else {
1431​ emit viewContextMenuRequested(screenPos);
1432​ }
1433​ }
1434​ return true;
1435​ }
1436​
1437​ bool emitItemActivated = !(m_view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick) || m_singleClickActivationEnforced) &&
1438​ (button & Qt::LeftButton) &&
1439​ index >= 0 && index < m_model->count();
1440​ if (emitItemActivated) {
1441​ emit itemActivated(index);
1442​ }
1443​ return false;
1444​}