Fix selection rect after porting from QFontMetrics::width()

[dolphin.git] / src / kitemviews / kitemlistcontroller.cpp

diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp
index 88f5d9f7cff1614fb8595b470d46916584710a27..0c25ebb8b9ace0f2703ffcb4dffdf64172cc21d5 100644 (file)
--- a/src/kitemviews/kitemlistcontroller.cpp
+++ b/src/kitemviews/kitemlistcontroller.cpp
@@ -2,8 +2,7 @@
  *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
  *   Copyright (C) 2012 by Frank Reininghaus <frank78ac@googlemail.com>    *
  *                                                                         *
  *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
  *   Copyright (C) 2012 by Frank Reininghaus <frank78ac@googlemail.com>    *
  *                                                                         *

- *   Based on the Itemviews NG project from Trolltech Labs:                *
- *   http://qt.gitorious.org/qt-labs/itemviews-ng                          *
+ *   Based on the Itemviews NG project from Trolltech Labs                 *

  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *


@@ -23,18 +22,15 @@
 
 #include "kitemlistcontroller.h"
 
 
 #include "kitemlistcontroller.h"
 

-#include <KGlobalSettings>
-#include <KDebug>
-
-#include "kitemlistview.h"

 #include "kitemlistselectionmanager.h"
 #include "kitemlistselectionmanager.h"

-
-#include "private/kitemlistrubberband.h"
+#include "kitemlistview.h"

 #include "private/kitemlistkeyboardsearchmanager.h"
 #include "private/kitemlistkeyboardsearchmanager.h"

+#include "private/kitemlistrubberband.h"
+#include "views/draganddrophelper.h"

 
 

+#include <QAccessible>

 #include <QApplication>
 #include <QDrag>
 #include <QApplication>
 #include <QDrag>

-#include <QEvent>

 #include <QGraphicsScene>
 #include <QGraphicsSceneEvent>
 #include <QGraphicsView>
 #include <QGraphicsScene>
 #include <QGraphicsSceneEvent>
 #include <QGraphicsView>


@@ -43,30 +39,34 @@
 
 KItemListController::KItemListController(KItemModelBase* model, KItemListView* view, QObject* parent) :
     QObject(parent),
 
 KItemListController::KItemListController(KItemModelBase* model, KItemListView* view, QObject* parent) :
     QObject(parent),

-    m_singleClickActivation(KGlobalSettings::singleClick()),
+    m_singleClickActivationEnforced(false),

     m_selectionTogglePressed(false),
     m_clearSelectionIfItemsAreNotDragged(false),
     m_selectionBehavior(NoSelection),
     m_selectionTogglePressed(false),
     m_clearSelectionIfItemsAreNotDragged(false),
     m_selectionBehavior(NoSelection),

-    m_model(0),
-    m_view(0),
+    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_selectionManager(new KItemListSelectionManager(this)),
     m_keyboardManager(new KItemListKeyboardSearchManager(this)),
     m_pressedIndex(-1),
     m_pressedMousePos(),

-    m_autoActivationTimer(0),
+    m_autoActivationTimer(nullptr),

     m_oldSelection(),
     m_keyboardAnchorIndex(-1),
     m_keyboardAnchorPos(0)
 {
     m_oldSelection(),
     m_keyboardAnchorIndex(-1),
     m_keyboardAnchorPos(0)
 {

-    connect(m_keyboardManager, SIGNAL(changeCurrentItem(QString,bool)),
-            this, SLOT(slotChangeCurrentItem(QString,bool)));
-    connect(m_selectionManager, SIGNAL(currentChanged(int,int)),
-            m_keyboardManager, SLOT(slotCurrentChanged(int,int)));
+    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);
     m_autoActivationTimer->setInterval(-1);
 
     m_autoActivationTimer = new QTimer(this);
     m_autoActivationTimer->setSingleShot(true);
     m_autoActivationTimer->setInterval(-1);

-    connect(m_autoActivationTimer, SIGNAL(timeout()), this, SLOT(slotAutoActivationTimeout()));
+    connect(m_autoActivationTimer, &QTimer::timeout, this, &KItemListController::slotAutoActivationTimeout);

 
     setModel(model);
     setView(view);
 
     setModel(model);
     setView(view);


@@ -74,10 +74,10 @@ KItemListController::KItemListController(KItemModelBase* model, KItemListView* v
 
 KItemListController::~KItemListController()
 {
 
 KItemListController::~KItemListController()
 {

-    setView(0);
+    setView(nullptr);

     Q_ASSERT(!m_view);
 
     Q_ASSERT(!m_view);
 

-    setModel(0);
+    setModel(nullptr);

     Q_ASSERT(!m_model);
 }
 
     Q_ASSERT(!m_model);
 }
 


@@ -124,7 +124,7 @@ void KItemListController::setView(KItemListView* view)
 
     KItemListView* oldView = m_view;
     if (oldView) {
 
     KItemListView* oldView = m_view;
     if (oldView) {

-        disconnect(oldView, SIGNAL(scrollOffsetChanged(qreal,qreal)), this, SLOT(slotViewScrollOffsetChanged(qreal,qreal)));
+        disconnect(oldView, &KItemListView::scrollOffsetChanged, this, &KItemListController::slotViewScrollOffsetChanged);

         oldView->deleteLater();
     }
 
         oldView->deleteLater();
     }
 


@@ -134,7 +134,7 @@ void KItemListController::setView(KItemListView* view)
         m_view->setParent(this);
         m_view->setController(this);
         m_view->setModel(m_model);
         m_view->setParent(this);
         m_view->setController(this);
         m_view->setModel(m_model);

-        connect(m_view, SIGNAL(scrollOffsetChanged(qreal,qreal)), this, SLOT(slotViewScrollOffsetChanged(qreal,qreal)));
+        connect(m_view, &KItemListView::scrollOffsetChanged, this, &KItemListController::slotViewScrollOffsetChanged);

         updateExtendedSelectionRegion();
     }
 
         updateExtendedSelectionRegion();
     }
 


@@ -157,36 +157,58 @@ KItemListController::SelectionBehavior KItemListController::selectionBehavior()
     return m_selectionBehavior;
 }
 
     return m_selectionBehavior;
 }
 

-void KItemListController::setAutoActivationDelay(int delay)
+void KItemListController::setAutoActivationBehavior(AutoActivationBehavior behavior)

 {
 {

-    m_autoActivationTimer->setInterval(delay);
+    m_autoActivationBehavior = behavior;

 }
 
 }
 

-int KItemListController::autoActivationDelay() const
+KItemListController::AutoActivationBehavior KItemListController::autoActivationBehavior() const

 {
 {

-    return m_autoActivationTimer->interval();
+    return m_autoActivationBehavior;

 }
 
 }
 

-void KItemListController::setSingleClickActivation(bool singleClick)
+void KItemListController::setMouseDoubleClickAction(MouseDoubleClickAction action)

 {
 {

-    m_singleClickActivation = singleClick;
+    m_mouseDoubleClickAction = action;

 }
 
 }
 

-bool KItemListController::singleClickActivation() const
+KItemListController::MouseDoubleClickAction KItemListController::mouseDoubleClickAction() const

 {
 {

-    return m_singleClickActivation;
+    return m_mouseDoubleClickAction;

 }
 
 }
 

-bool KItemListController::showEvent(QShowEvent* event)
+int KItemListController::indexCloseToMousePressedPosition() const

 {
 {

-    Q_UNUSED(event);
-    return false;
+    QHashIterator<KItemListWidget*, KItemListGroupHeader*> it(m_view->m_visibleGroups);
+    while (it.hasNext()) {
+        it.next();
+        KItemListGroupHeader *groupHeader = it.value();
+        const QPointF mappedToGroup = groupHeader->mapFromItem(nullptr, m_pressedMousePos);
+        if (groupHeader->contains(mappedToGroup)) {
+            return it.key()->index();
+        }
+    }
+    return -1;

 }
 
 }
 

-bool KItemListController::hideEvent(QHideEvent* event)
+void KItemListController::setAutoActivationDelay(int delay)

 {
 {

-    Q_UNUSED(event);
-    return false;
+    m_autoActivationTimer->setInterval(delay);
+}
+
+int KItemListController::autoActivationDelay() const
+{
+    return m_autoActivationTimer->interval();
+}
+
+void KItemListController::setSingleClickActivationEnforced(bool singleClick)
+{
+    m_singleClickActivationEnforced = singleClick;
+}
+
+bool KItemListController::singleClickActivationEnforced() const
+{
+    return m_singleClickActivationEnforced;

 }
 
 bool KItemListController::keyPressEvent(QKeyEvent* event)
 }
 
 bool KItemListController::keyPressEvent(QKeyEvent* event)


@@ -210,6 +232,10 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
     const bool shiftPressed = event->modifiers() & Qt::ShiftModifier;
     const bool controlPressed = event->modifiers() & Qt::ControlModifier;
     const bool shiftOrControlPressed = shiftPressed || controlPressed;
     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 int itemCount = m_model->count();
 
 
     const int itemCount = m_model->count();
 


@@ -225,11 +251,8 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
         }
     }
 
         }
     }
 

-    const bool selectSingleItem = m_selectionBehavior != NoSelection &&
-                                  itemCount == 1 &&
-                                  (key == Qt::Key_Home || key == Qt::Key_End  ||
-                                   key == Qt::Key_Up   || key == Qt::Key_Down ||
-                                   key == Qt::Key_Left || key == Qt::Key_Right);
+    const bool selectSingleItem = m_selectionBehavior != NoSelection && itemCount == 1 && navigationPressed;
+

     if (selectSingleItem) {
         const int current = m_selectionManager->currentItem();
         m_selectionManager->setSelected(current);
     if (selectSingleItem) {
         const int current = m_selectionManager->currentItem();
         m_selectionManager->setSelected(current);


@@ -341,41 +364,28 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
 
     case Qt::Key_Enter:
     case Qt::Key_Return: {
 
     case Qt::Key_Enter:
     case Qt::Key_Return: {

-        const QSet<int> selectedItems = m_selectionManager->selectedItems();
+        const KItemSet selectedItems = m_selectionManager->selectedItems();

         if (selectedItems.count() >= 2) {
             emit itemsActivated(selectedItems);
         } else if (selectedItems.count() == 1) {
         if (selectedItems.count() >= 2) {
             emit itemsActivated(selectedItems);
         } else if (selectedItems.count() == 1) {

-            emit itemActivated(selectedItems.toList().first());
+            emit itemActivated(selectedItems.first());

         } else {
             emit itemActivated(index);
         }
         break;
     }
 
         } else {
             emit itemActivated(index);
         }
         break;
     }
 

-    case Qt::Key_Space:
-        if (m_selectionBehavior == MultiSelection) {
-            if (controlPressed) {
-                m_selectionManager->endAnchoredSelection();
-                m_selectionManager->setSelected(index, 1, KItemListSelectionManager::Toggle);
-                m_selectionManager->beginAnchoredSelection(index);
-            } else {
-                const int current = m_selectionManager->currentItem();
-                m_selectionManager->setSelected(current);
-            }
-        }
-        break;
-

     case Qt::Key_Menu: {
         // Emit the signal itemContextMenuRequested() in case if at least one
         // item is selected. Otherwise the signal viewContextMenuRequested() will be emitted.
     case Qt::Key_Menu: {
         // Emit the signal itemContextMenuRequested() in case if at least one
         // item is selected. Otherwise the signal viewContextMenuRequested() will be emitted.

-        const QSet<int> selectedItems = m_selectionManager->selectedItems();
+        const KItemSet selectedItems = m_selectionManager->selectedItems();

         int index = -1;
         if (selectedItems.count() >= 2) {
             const int currentItemIndex = m_selectionManager->currentItem();
             index = selectedItems.contains(currentItemIndex)
         int index = -1;
         if (selectedItems.count() >= 2) {
             const int currentItemIndex = m_selectionManager->currentItem();
             index = selectedItems.contains(currentItemIndex)

-                    ? currentItemIndex : selectedItems.toList().first();
+                    ? currentItemIndex : selectedItems.first();

         } else if (selectedItems.count() == 1) {
         } else if (selectedItems.count() == 1) {

-            index = selectedItems.toList().first();
+            index = selectedItems.first();

         }
 
         if (index >= 0) {
         }
 
         if (index >= 0) {


@@ -393,10 +403,31 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
             m_selectionManager->clearSelection();
         }
         m_keyboardManager->cancelSearch();
             m_selectionManager->clearSelection();
         }
         m_keyboardManager->cancelSearch();

+        emit escapePressed();

         break;
 
         break;
 

+    case Qt::Key_Space:
+        if (m_selectionBehavior == MultiSelection) {
+            if (controlPressed) {
+                // Toggle the selection state of the current item.
+                m_selectionManager->endAnchoredSelection();
+                m_selectionManager->setSelected(index, 1, KItemListSelectionManager::Toggle);
+                m_selectionManager->beginAnchoredSelection(index);
+                break;
+            } else {
+                // Select the current item if it is not selected yet.
+                const int current = m_selectionManager->currentItem();
+                if (!m_selectionManager->isSelected(current)) {
+                    m_selectionManager->setSelected(current);
+                    break;
+                }
+            }
+        }
+        Q_FALLTHROUGH();  // fall through to the default case and add the Space to the current search string.

     default:
         m_keyboardManager->addKeys(event->text());
     default:
         m_keyboardManager->addKeys(event->text());

+        // Make sure unconsumed events get propagated up the chain. #302329
+        event->ignore();

         return false;
     }
 
         return false;
     }
 


@@ -429,7 +460,9 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
             }
             break;
         }
             }
             break;
         }

+    }

 
 

+    if (navigationPressed) {

         m_view->scrollToItem(index);
     }
     return true;
         m_view->scrollToItem(index);
     }
     return true;


@@ -440,18 +473,21 @@ void KItemListController::slotChangeCurrentItem(const QString& text, bool search
     if (!m_model || m_model->count() == 0) {
         return;
     }
     if (!m_model || m_model->count() == 0) {
         return;
     }

-    const int currentIndex = m_selectionManager->currentItem();

     int index;
     if (searchFromNextItem) {
     int index;
     if (searchFromNextItem) {

+        const int currentIndex = m_selectionManager->currentItem();

         index = m_model->indexForKeyboardSearch(text, (currentIndex + 1) % m_model->count());
     } else {
         index = m_model->indexForKeyboardSearch(text, (currentIndex + 1) % m_model->count());
     } else {

-        index = m_model->indexForKeyboardSearch(text, currentIndex);
+        index = m_model->indexForKeyboardSearch(text, 0);

     }
     if (index >= 0) {
         m_selectionManager->setCurrentItem(index);
     }
     if (index >= 0) {
         m_selectionManager->setCurrentItem(index);

-        m_selectionManager->clearSelection();
-        m_selectionManager->setSelected(index, 1);
-        m_selectionManager->beginAnchoredSelection(index);
+
+        if (m_selectionBehavior != NoSelection) {
+            m_selectionManager->replaceSelection(index);
+            m_selectionManager->beginAnchoredSelection(index);
+        }
+

         m_view->scrollToItem(index);
     }
 }
         m_view->scrollToItem(index);
     }
 }


@@ -467,11 +503,20 @@ void KItemListController::slotAutoActivationTimeout()
         return;
     }
 
         return;
     }
 

-    if (m_model->supportsDropping(index)) {
+    /* m_view->isUnderMouse() fixes a bug in the Folder-View-Panel and in the
+     * Places-Panel.
+     *
+     * Bug: When you drag a file onto a Folder-View-Item or a Places-Item and
+     * then move away before the auto-activation timeout triggers, than the
+     * item still becomes activated/expanded.
+     *
+     * See Bug 293200 and 305783
+     */
+    if (m_model->supportsDropping(index) && m_view->isUnderMouse()) {

         if (m_view->supportsItemExpanding() && m_model->isExpandable(index)) {
             const bool expanded = m_model->isExpanded(index);
             m_model->setExpanded(index, !expanded);
         if (m_view->supportsItemExpanding() && m_model->isExpandable(index)) {
             const bool expanded = m_model->isExpanded(index);
             m_model->setExpanded(index, !expanded);

-        } else {
+        } else if (m_autoActivationBehavior != ExpansionOnly) {

             emit itemActivated(index);
         }
     }
             emit itemActivated(index);
         }
     }


@@ -479,7 +524,7 @@ void KItemListController::slotAutoActivationTimeout()
 
 bool KItemListController::inputMethodEvent(QInputMethodEvent* event)
 {
 
 bool KItemListController::inputMethodEvent(QInputMethodEvent* event)
 {

-    Q_UNUSED(event);
+    Q_UNUSED(event)

     return false;
 }
 
     return false;
 }
 


@@ -493,6 +538,12 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const
     m_pressedIndex = m_view->itemAt(m_pressedMousePos);
     emit mouseButtonPressed(m_pressedIndex, event->buttons());
 
     m_pressedIndex = m_view->itemAt(m_pressedMousePos);
     emit mouseButtonPressed(m_pressedIndex, event->buttons());
 

+    if (event->buttons() & (Qt::BackButton | Qt::ForwardButton)) {
+        // Do not select items when clicking the back/forward buttons, see
+        // https://bugs.kde.org/show_bug.cgi?id=327412.
+        return true;
+    }
+

     if (m_view->isAboveExpansionToggle(m_pressedIndex, m_pressedMousePos)) {
         m_selectionManager->endAnchoredSelection();
         m_selectionManager->setCurrentItem(m_pressedIndex);
     if (m_view->isAboveExpansionToggle(m_pressedIndex, m_pressedMousePos)) {
         m_selectionManager->endAnchoredSelection();
         m_selectionManager->setCurrentItem(m_pressedIndex);


@@ -534,6 +585,10 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const
         // -> remember that the user pressed an item which had been selected already and
         //    clear the selection in mouseReleaseEvent(), unless the items are dragged.
         m_clearSelectionIfItemsAreNotDragged = true;
         // -> remember that the user pressed an item which had been selected already and
         //    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 (!shiftPressed) {
     }
 
     if (!shiftPressed) {


@@ -541,6 +596,16 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const
         m_selectionManager->endAnchoredSelection();
     }
 
         m_selectionManager->endAnchoredSelection();
     }
 

+    if (event->buttons() & Qt::RightButton) {
+        // Stop rubber band from persisting after right-clicks
+        KItemListRubberBand* rubberBand = m_view->rubberBand();
+        if (rubberBand->isActive()) {
+            disconnect(rubberBand, &KItemListRubberBand::endPositionChanged, this, &KItemListController::slotRubberBandChanged);
+            rubberBand->setActive(false);
+            m_view->setAutoScroll(false);
+        }
+    }
+

     if (m_pressedIndex >= 0) {
         m_selectionManager->setCurrentItem(m_pressedIndex);
 
     if (m_pressedIndex >= 0) {
         m_selectionManager->setCurrentItem(m_pressedIndex);
 


@@ -603,7 +668,7 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const
         rubberBand->setStartPosition(startPos);
         rubberBand->setEndPosition(startPos);
         rubberBand->setActive(true);
         rubberBand->setStartPosition(startPos);
         rubberBand->setEndPosition(startPos);
         rubberBand->setActive(true);

-        connect(rubberBand, SIGNAL(endPositionChanged(QPointF,QPointF)), this, SLOT(slotRubberBandChanged()));
+        connect(rubberBand, &KItemListRubberBand::endPositionChanged, this, &KItemListController::slotRubberBandChanged);

         m_view->setAutoScroll(true);
     }
 
         m_view->setAutoScroll(true);
     }
 


@@ -691,7 +756,7 @@ bool KItemListController::mouseReleaseEvent(QGraphicsSceneMouseEvent* event, con
 
     KItemListRubberBand* rubberBand = m_view->rubberBand();
     if (rubberBand->isActive()) {
 
     KItemListRubberBand* rubberBand = m_view->rubberBand();
     if (rubberBand->isActive()) {

-        disconnect(rubberBand, SIGNAL(endPositionChanged(QPointF,QPointF)), this, SLOT(slotRubberBandChanged()));
+        disconnect(rubberBand, &KItemListRubberBand::endPositionChanged, this, &KItemListController::slotRubberBandChanged);

         rubberBand->setActive(false);
         m_oldSelection.clear();
         m_view->setAutoScroll(false);
         rubberBand->setActive(false);
         m_oldSelection.clear();
         m_view->setAutoScroll(false);


@@ -722,7 +787,7 @@ bool KItemListController::mouseReleaseEvent(QGraphicsSceneMouseEvent* event, con
             } else if (shiftOrControlPressed) {
                 // The mouse click should only update the selection, not trigger the item
                 emitItemActivated = false;
             } else if (shiftOrControlPressed) {
                 // The mouse click should only update the selection, not trigger the item
                 emitItemActivated = false;

-            } else if (!m_singleClickActivation) {
+            } else if (!(m_view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick) || m_singleClickActivationEnforced)) {

                 emitItemActivated = false;
             }
             if (emitItemActivated) {
                 emitItemActivated = false;
             }
             if (emitItemActivated) {


@@ -744,7 +809,31 @@ bool KItemListController::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event,
     const QPointF pos = transform.map(event->pos());
     const int index = m_view->itemAt(pos);
 
     const QPointF pos = transform.map(event->pos());
     const int index = m_view->itemAt(pos);
 

-    bool emitItemActivated = !m_singleClickActivation &&
+    // 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 (event->button() & Qt::RightButton) {
+        m_selectionManager->clearSelection();
+        if (index >= 0) {
+            m_selectionManager->setSelected(index);
+            emit itemContextMenuRequested(index, event->screenPos());
+        } else {
+            const QRectF headerBounds = m_view->headerBoundaries();
+            if (headerBounds.contains(event->pos())) {
+                emit headerContextMenuRequested(event->screenPos());
+            } else {
+                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();
     if (emitItemActivated) {
                              (event->button() & Qt::LeftButton) &&
                              index >= 0 && index < m_model->count();
     if (emitItemActivated) {


@@ -755,16 +844,20 @@ bool KItemListController::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event,
 
 bool KItemListController::dragEnterEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform)
 {
 
 bool KItemListController::dragEnterEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform)
 {

-    Q_UNUSED(event);
-    Q_UNUSED(transform);
+    Q_UNUSED(event)
+    Q_UNUSED(transform)
+
+    DragAndDropHelper::clearUrlListMatchesUrlCache();
+

     return false;
 }
 
 bool KItemListController::dragLeaveEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform)
 {
     return false;
 }
 
 bool KItemListController::dragLeaveEvent(QGraphicsSceneDragDropEvent* event, const QTransform& transform)
 {

-    Q_UNUSED(event);
-    Q_UNUSED(transform);
+    Q_UNUSED(event)
+    Q_UNUSED(transform)

 
 

+    m_autoActivationTimer->stop();

     m_view->setAutoScroll(false);
     m_view->hideDropIndicator();
 
     m_view->setAutoScroll(false);
     m_view->hideDropIndicator();
 


@@ -782,8 +875,8 @@ bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, cons
         return false;
     }
 
         return false;
     }
 

-    event->acceptProposedAction();

 
 

+    QUrl hoveredDir = m_model->directory();

     KItemListWidget* oldHoveredWidget = hoveredWidget();
 
     const QPointF pos = transform.map(event->pos());
     KItemListWidget* oldHoveredWidget = hoveredWidget();
 
     const QPointF pos = transform.map(event->pos());


@@ -796,29 +889,53 @@ bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, cons
             oldHoveredWidget->setHovered(false);
             emit itemUnhovered(oldHoveredWidget->index());
         }
             oldHoveredWidget->setHovered(false);
             emit itemUnhovered(oldHoveredWidget->index());
         }

+    }

 
 

-        if (newHoveredWidget) {
-            bool droppingBetweenItems = false;
-            if (m_model->sortRole().isEmpty()) {
-                // The model supports inserting items between other items.
-                droppingBetweenItems = (m_view->showDropIndicator(pos) >= 0);
-            }
+    if (newHoveredWidget) {
+        bool droppingBetweenItems = false;
+        if (m_model->sortRole().isEmpty()) {
+            // The model supports inserting items between other items.
+            droppingBetweenItems = (m_view->showDropIndicator(pos) >= 0);
+        }
+
+        const int index = newHoveredWidget->index();
+
+        if (m_model->isDir(index)) {
+            hoveredDir = m_model->url(index);
+        }

 
 

-            const int index = newHoveredWidget->index();
-            if (!droppingBetweenItems && m_model->supportsDropping(index)) {
+        if (!droppingBetweenItems) {
+            if (m_model->supportsDropping(index)) {

                 // Something has been dragged on an item.
                 m_view->hideDropIndicator();
                 // Something has been dragged on an item.
                 m_view->hideDropIndicator();

-                newHoveredWidget->setHovered(true);
-                emit itemHovered(index);
+                if (!newHoveredWidget->isHovered()) {
+                    newHoveredWidget->setHovered(true);
+                    emit itemHovered(index);
+                }

 
 

-                if (m_autoActivationTimer->interval() >= 0) {
+                if (!m_autoActivationTimer->isActive() && m_autoActivationTimer->interval() >= 0) {

                     m_autoActivationTimer->setProperty("index", index);
                     m_autoActivationTimer->start();
                 }
             }
                     m_autoActivationTimer->setProperty("index", index);
                     m_autoActivationTimer->start();
                 }
             }

+        } else {
+            m_autoActivationTimer->stop();
+            if (newHoveredWidget && newHoveredWidget->isHovered()) {
+                newHoveredWidget->setHovered(false);
+                emit itemUnhovered(index);
+            }

         }
         }

+    } else {
+        m_view->hideDropIndicator();

     }
 
     }
 

+    if (DragAndDropHelper::urlListMatchesUrl(event->mimeData()->urls(), hoveredDir)) {
+        event->setDropAction(Qt::IgnoreAction);
+        event->ignore();
+    } else {
+        event->setDropAction(event->proposedAction());
+        event->accept();
+    }

     return false;
 }
 
     return false;
 }
 


@@ -843,24 +960,27 @@ bool KItemListController::dropEvent(QGraphicsSceneDragDropEvent* event, const QT
         // Something has been dropped between two items.
         m_view->hideDropIndicator();
         emit aboveItemDropEvent(dropAboveIndex, event);
         // Something has been dropped between two items.
         m_view->hideDropIndicator();
         emit aboveItemDropEvent(dropAboveIndex, event);

-    } else {
+    } 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);
     }
 
         // Something has been dropped on an item or on an empty part of the view.
         emit itemDropEvent(m_view->itemAt(pos), event);
     }
 

+    QAccessibleEvent accessibilityEvent(view(), QAccessible::DragDropEnd);
+    QAccessible::updateAccessibility(&accessibilityEvent);
+

     return true;
 }
 
 bool KItemListController::hoverEnterEvent(QGraphicsSceneHoverEvent* event, const QTransform& transform)
 {
     return true;
 }
 
 bool KItemListController::hoverEnterEvent(QGraphicsSceneHoverEvent* event, const QTransform& transform)
 {

-    Q_UNUSED(event);
-    Q_UNUSED(transform);
+    Q_UNUSED(event)
+    Q_UNUSED(transform)

     return false;
 }
 
 bool KItemListController::hoverMoveEvent(QGraphicsSceneHoverEvent* event, const QTransform& transform)
 {
     return false;
 }
 
 bool KItemListController::hoverMoveEvent(QGraphicsSceneHoverEvent* event, const QTransform& transform)
 {

-    Q_UNUSED(transform);
+    Q_UNUSED(transform)

     if (!m_model || !m_view) {
         return false;
     }
     if (!m_model || !m_view) {
         return false;
     }


@@ -877,8 +997,13 @@ bool KItemListController::hoverMoveEvent(QGraphicsSceneHoverEvent* event, const
 
         if (newHoveredWidget) {
             newHoveredWidget->setHovered(true);
 
         if (newHoveredWidget) {
             newHoveredWidget->setHovered(true);

+            const QPointF mappedPos = newHoveredWidget->mapFromItem(m_view, pos);
+            newHoveredWidget->setHoverPosition(mappedPos);

             emit itemHovered(newHoveredWidget->index());
         }
             emit itemHovered(newHoveredWidget->index());
         }

+    } else if (oldHoveredWidget) {
+        const QPointF mappedPos = oldHoveredWidget->mapFromItem(m_view, pos);
+        oldHoveredWidget->setHoverPosition(mappedPos);

     }
 
     return false;
     }
 
     return false;


@@ -886,8 +1011,8 @@ bool KItemListController::hoverMoveEvent(QGraphicsSceneHoverEvent* event, const
 
 bool KItemListController::hoverLeaveEvent(QGraphicsSceneHoverEvent* event, const QTransform& transform)
 {
 
 bool KItemListController::hoverLeaveEvent(QGraphicsSceneHoverEvent* event, const QTransform& transform)
 {

-    Q_UNUSED(event);
-    Q_UNUSED(transform);
+    Q_UNUSED(event)
+    Q_UNUSED(transform)

 
     if (!m_model || !m_view) {
         return false;
 
     if (!m_model || !m_view) {
         return false;


@@ -904,15 +1029,15 @@ bool KItemListController::hoverLeaveEvent(QGraphicsSceneHoverEvent* event, const
 
 bool KItemListController::wheelEvent(QGraphicsSceneWheelEvent* event, const QTransform& transform)
 {
 
 bool KItemListController::wheelEvent(QGraphicsSceneWheelEvent* event, const QTransform& transform)
 {

-    Q_UNUSED(event);
-    Q_UNUSED(transform);
+    Q_UNUSED(event)
+    Q_UNUSED(transform)

     return false;
 }
 
 bool KItemListController::resizeEvent(QGraphicsSceneResizeEvent* event, const QTransform& transform)
 {
     return false;
 }
 
 bool KItemListController::resizeEvent(QGraphicsSceneResizeEvent* event, const QTransform& transform)
 {

-    Q_UNUSED(event);
-    Q_UNUSED(transform);
+    Q_UNUSED(event)
+    Q_UNUSED(transform)

     return false;
 }
 
     return false;
 }
 


@@ -1012,7 +1137,7 @@ void KItemListController::slotRubberBandChanged()
         }
     }
 
         }
     }
 

-    QSet<int> selectedItems;
+    KItemSet selectedItems;

 
     // Select all visible items that intersect with the rubberband
     foreach (const KItemListWidget* widget, m_view->visibleItemListWidgets()) {
 
     // Select all visible items that intersect with the rubberband
     foreach (const KItemListWidget* widget, m_view->visibleItemListWidgets()) {


@@ -1060,7 +1185,7 @@ void KItemListController::slotRubberBandChanged()
         // 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.
         // 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) + (selectedItems - m_oldSelection));
+        m_selectionManager->setSelectedItems(m_oldSelection ^ selectedItems);

     }
     else {
         m_selectionManager->setSelectedItems(selectedItems + m_oldSelection);
     }
     else {
         m_selectionManager->setSelectedItems(selectedItems + m_oldSelection);


@@ -1073,7 +1198,7 @@ void KItemListController::startDragging()
         return;
     }
 
         return;
     }
 

-    const QSet<int> selectedItems = m_selectionManager->selectedItems();
+    const KItemSet selectedItems = m_selectionManager->selectedItems();

     if (selectedItems.isEmpty()) {
         return;
     }
     if (selectedItems.isEmpty()) {
         return;
     }


@@ -1091,10 +1216,13 @@ void KItemListController::startDragging()
     const QPixmap pixmap = m_view->createDragPixmap(selectedItems);
     drag->setPixmap(pixmap);
 
     const QPixmap pixmap = m_view->createDragPixmap(selectedItems);
     drag->setPixmap(pixmap);
 

-    const QPoint hotSpot(pixmap.width() / 2, 0);
+    const QPoint hotSpot((pixmap.width() / pixmap.devicePixelRatio()) / 2, 0);

     drag->setHotSpot(hotSpot);
 
     drag->setHotSpot(hotSpot);
 

-    drag->exec(Qt::MoveAction | Qt::CopyAction | Qt::LinkAction, Qt::CopyAction);
+    drag->exec(Qt::MoveAction | Qt::CopyAction | Qt::LinkAction, Qt::MoveAction);
+
+    QAccessibleEvent accessibilityEvent(view(), QAccessible::DragDropStart);
+    QAccessible::updateAccessibility(&accessibilityEvent);

 }
 
 KItemListWidget* KItemListController::hoveredWidget() const
 }
 
 KItemListWidget* KItemListController::hoveredWidget() const


@@ -1107,7 +1235,7 @@ KItemListWidget* KItemListController::hoveredWidget() const
         }
     }
 
         }
     }
 

-    return 0;
+    return nullptr;

 }
 
 KItemListWidget* KItemListController::widgetForPos(const QPointF& pos) const
 }
 
 KItemListWidget* KItemListController::widgetForPos(const QPointF& pos) const


@@ -1124,7 +1252,7 @@ KItemListWidget* KItemListController::widgetForPos(const QPointF& pos) const
         }
     }
 
         }
     }
 

-    return 0;
+    return nullptr;

 }
 
 void KItemListController::updateKeyboardAnchor()
 }
 
 void KItemListController::updateKeyboardAnchor()


@@ -1230,4 +1358,3 @@ void KItemListController::updateExtendedSelectionRegion()
     }
 }
 
     }
 }
 

-#include "kitemlistcontroller.moc"