Differential D10085 Diff 26473 src/kitemviews/kitemlistcontroller.cpp

Changeset View

Standalone View

View Options

src/kitemviews/kitemlistcontroller.cpp

Show First 20 Lines • Show All 53 Lines • ▼ Show 20 Line(s)44KItemListController::KItemListController(KItemModelBase* model, KItemListView* view, QObject* parent) :
54 m_selectionManager(new KItemListSelectionManager(this)), 54​ m_selectionManager(new KItemListSelectionManager(this)),
55 m_keyboardManager(new KItemListKeyboardSearchManager(this)), 55​ m_keyboardManager(new KItemListKeyboardSearchManager(this)),
56 m_pressedIndex(-1), 56​ m_pressedIndex(-1),
57 m_pressedMousePos(), 57​ m_pressedMousePos(),
58 m_autoActivationTimer(nullptr), 58​ m_autoActivationTimer(nullptr),
59 m_oldSelection(), 59​ m_oldSelection(),
60 m_keyboardAnchorIndex(-1), 60​ m_keyboardAnchorIndex(-1),
61 m_keyboardAnchorPos(0) 61​ m_keyboardAnchorPos(0)
62{ 62​{
elvisangelaccioUnsubmitted
Done

Not needed, default constructor is automatically called.

elvisangelaccio: Not needed, default constructor is automatically called.
63 connect(m_keyboardManager, &KItemListKeyboardSearchManager::changeCurrentItem, 63​ connect(m_keyboardManager, &KItemListKeyboardSearchManager::changeCurrentItem,
64 this, &KItemListController::slotChangeCurrentItem); 64​ this, &KItemListController::slotChangeCurrentItem);
65 connect(m_selectionManager, &KItemListSelectionManager::currentChanged, 65​ connect(m_selectionManager, &KItemListSelectionManager::currentChanged,
66 m_keyboardManager, &KItemListKeyboardSearchManager::slotCurrentChanged); 66​ m_keyboardManager, &KItemListKeyboardSearchManager::slotCurrentChanged);
67 67​
68 m_autoActivationTimer = new QTimer(this); 68​ m_autoActivationTimer = new QTimer(this);
69 m_autoActivationTimer->setSingleShot(true); 69​ m_autoActivationTimer->setSingleShot(true);
70 m_autoActivationTimer->setInterval(-1); 70​ m_autoActivationTimer->setInterval(-1);
▲ Show 20 Lines • Show All 773 Lines • ▼ Show 20 Line(s)811{
844 } 844​ }
845 return false; 845​ return false;
846} 846​}
847 847​
848bool KItemListController::dragEnterEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform) 848​bool KItemListController::dragEnterEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform)
849{ 849​{
850 Q_UNUSED(event); 850​ Q_UNUSED(event);
851 Q_UNUSED(transform); 851​ Q_UNUSED(transform);
852​
853​ DragAndDropHelper::clearCacheUrlListMatchesUrl();
854​
852 return false; 855​ return false;
853} 856​}
854 857​
855bool KItemListController::dragLeaveEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform) 858​bool KItemListController::dragLeaveEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform)
856{ 859​{
857 Q_UNUSED(event); 860​ Q_UNUSED(event);
858 Q_UNUSED(transform); 861​ Q_UNUSED(transform);
859 862​
Show All 10 Lines
870} 873​}
871 874​
872bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform) 875​bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform)
873{ 876​{
874 if (!m_model || !m_view) { 877​ if (!m_model || !m_view) {
875 return false; 878​ return false;
876 } 879​ }
877 880​
878 ​
879 QUrl hoveredDir = m_model->directory(); 881​ QUrl hoveredDir = m_model->directory();
880 KItemListWidget* oldHoveredWidget = hoveredWidget(); 882​ KItemListWidget* oldHoveredWidget = hoveredWidget();
881 883​
882 const QPointF pos = transform.map(event->pos()); 884​ const QPointF pos = transform.map(event->pos());
883 KItemListWidget* newHoveredWidget = widgetForPos(pos); 885​ KItemListWidget* newHoveredWidget = widgetForPos(pos);
884 886​
885 if (oldHoveredWidget != newHoveredWidget) { 887​ if (oldHoveredWidget != newHoveredWidget) {
886 m_autoActivationTimer->stop(); 888​ m_autoActivationTimer->stop();
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Line(s)930 } else {
929 m_view->hideDropIndicator(); 931​ m_view->hideDropIndicator();
930 } 932​ }
931 933​
932 event->setAccepted(!DragAndDropHelper::urlListMatchesUrl(event->mimeData()->urls(), hoveredDir)); 934​ event->setAccepted(!DragAndDropHelper::urlListMatchesUrl(event->mimeData()->urls(), hoveredDir));
933 935​
934 return false; 936​ return false;
935} 937​}
936 938​
937bool KItemListController::dropEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform) 939​bool KItemListController::dropEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform)
elvisangelaccioUnsubmitted
Done

m_dropAccepted is a bit misleading as name for the member variable. Maybe m_dropAcceptable could work better.

elvisangelaccio: `m_dropAccepted` is a bit misleading as name for the member variable. Maybe `m_dropAcceptable`…
938{ 940​{
939 if (!m_view) { 941​ if (!m_view) {
940 return false; 942​ return false;
941 } 943​ }
942 944​
943 m_autoActivationTimer->stop(); 945​ m_autoActivationTimer->stop();
944 m_view->setAutoScroll(false); 946​ m_view->setAutoScroll(false);
945 947​
▲ Show 20 Lines • Show All 410 Lines • Show Last 20 Lines