Fix scrolling during inline renaming causes rename of wrong file

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

diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index 0090f8620c90fa34cb90c092d06208ebcfb129f6..d26809797954fa8362812a4cbe09016f8c7866c0 100644 (file)
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -22,12 +22,12 @@
 
 #include "kitemlistview.h"
 
 
 #include "kitemlistview.h"
 

-#include <KDebug>
+#include "dolphindebug.h"

 #include "kitemlistcontainer.h"
 #include "kitemlistcontroller.h"
 #include "kitemlistheader.h"
 #include "kitemlistselectionmanager.h"
 #include "kitemlistcontainer.h"
 #include "kitemlistcontroller.h"
 #include "kitemlistheader.h"
 #include "kitemlistselectionmanager.h"

-#include "kitemlistwidget.h"
+#include "kstandarditemlistwidget.h"

 
 #include "private/kitemlistheaderwidget.h"
 #include "private/kitemlistrubberband.h"
 
 #include "private/kitemlistheaderwidget.h"
 #include "private/kitemlistrubberband.h"


@@ -35,23 +35,17 @@
 #include "private/kitemlistviewlayouter.h"
 #include "private/kitemlistviewanimation.h"
 
 #include "private/kitemlistviewlayouter.h"
 #include "private/kitemlistviewanimation.h"
 

-#include <QCursor>

 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsView>
 #include <QPainter>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsView>
 #include <QPainter>

-#include <QPropertyAnimation>

 #include <QStyle>
 #include <QStyleOptionRubberBand>
 #include <QTimer>
 #include <QStyle>
 #include <QStyleOptionRubberBand>
 #include <QTimer>

+#include <QElapsedTimer>

 
 #include <algorithm>
 
 
 #include <algorithm>
 

-#if 0

 #include "kitemlistviewaccessible.h"
 #include "kitemlistviewaccessible.h"

-#else
-#define QT_NO_ACCESSIBILITY 1
-#pragma message("TODO: port accessibility to Qt5")
-#endif

 
 namespace {
     // Time in ms until reaching the autoscroll margin triggers
 
 namespace {
     // Time in ms until reaching the autoscroll margin triggers


@@ -63,7 +57,7 @@ namespace {
 }
 
 #ifndef QT_NO_ACCESSIBILITY
 }
 
 #ifndef QT_NO_ACCESSIBILITY

-QAccessibleInterface* accessibleInterfaceFactory(const QString &key, QObject *object)
+QAccessibleInterface* accessibleInterfaceFactory(const QString& key, QObject* object)

 {
     Q_UNUSED(key)
 
 {
     Q_UNUSED(key)
 


@@ -315,9 +309,7 @@ KItemModelBase* KItemListView::model() const
 
 void KItemListView::setWidgetCreator(KItemListWidgetCreatorBase* widgetCreator)
 {
 
 void KItemListView::setWidgetCreator(KItemListWidgetCreatorBase* widgetCreator)
 {

-    if (m_widgetCreator) {
-        delete m_widgetCreator;
-    }
+    delete m_widgetCreator;

     m_widgetCreator = widgetCreator;
 }
 
     m_widgetCreator = widgetCreator;
 }
 


@@ -331,9 +323,7 @@ KItemListWidgetCreatorBase* KItemListView::widgetCreator() const
 
 void KItemListView::setGroupHeaderCreator(KItemListGroupHeaderCreatorBase* groupHeaderCreator)
 {
 
 void KItemListView::setGroupHeaderCreator(KItemListGroupHeaderCreatorBase* groupHeaderCreator)
 {

-    if (m_groupHeaderCreator) {
-        delete m_groupHeaderCreator;
-    }
+    delete m_groupHeaderCreator;

     m_groupHeaderCreator = groupHeaderCreator;
 }
 
     m_groupHeaderCreator = groupHeaderCreator;
 }
 


@@ -350,6 +340,11 @@ QSizeF KItemListView::itemSize() const
     return m_itemSize;
 }
 
     return m_itemSize;
 }
 

+QSizeF KItemListView::itemSizeHint() const
+{
+    return m_sizeHintResolver->maxSizeHint();
+}
+

 const KItemListStyleOption& KItemListView::styleOption() const
 {
     return m_styleOption;
 const KItemListStyleOption& KItemListView::styleOption() const
 {
     return m_styleOption;


@@ -454,6 +449,19 @@ bool KItemListView::isAboveExpansionToggle(int index, const QPointF& pos) const
     return false;
 }
 
     return false;
 }
 

+bool KItemListView::isAboveText(int index, const QPointF &pos) const
+{
+    const KItemListWidget* widget = m_visibleItems.value(index);
+    if (widget) {
+        const QRectF &textRect = widget->textRect();
+        if (!textRect.isEmpty()) {
+            const QPointF mappedPos = widget->mapFromItem(this, pos);
+            return textRect.contains(mappedPos);
+        }
+    }
+    return false;
+}
+

 int KItemListView::firstVisibleIndex() const
 {
     return m_layouter->firstVisibleIndex();
 int KItemListView::firstVisibleIndex() const
 {
     return m_layouter->firstVisibleIndex();


@@ -464,9 +472,9 @@ int KItemListView::lastVisibleIndex() const
     return m_layouter->lastVisibleIndex();
 }
 
     return m_layouter->lastVisibleIndex();
 }
 

-void KItemListView::calculateItemSizeHints(QVector<QSizeF>& sizeHints) const
+void KItemListView::calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint) const

 {
 {

-    widgetCreator()->calculateItemSizeHints(sizeHints, this);
+    widgetCreator()->calculateItemSizeHints(logicalHeightHints, logicalWidthHint, this);

 }
 
 void KItemListView::setSupportsItemExpanding(bool supportsExpanding)
 }
 
 void KItemListView::setSupportsItemExpanding(bool supportsExpanding)


@@ -549,7 +557,7 @@ void KItemListView::endTransaction()
     --m_activeTransactions;
     if (m_activeTransactions < 0) {
         m_activeTransactions = 0;
     --m_activeTransactions;
     if (m_activeTransactions < 0) {
         m_activeTransactions = 0;

-        kWarning() << "Mismatch between beginTransaction()/endTransaction()";
+        qCWarning(DolphinDebug) << "Mismatch between beginTransaction()/endTransaction()";

     }
 
     if (m_activeTransactions == 0) {
     }
 
     if (m_activeTransactions == 0) {


@@ -634,7 +642,7 @@ QPixmap KItemListView::createDragPixmap(const KItemSet& indexes) const
 
 void KItemListView::editRole(int index, const QByteArray& role)
 {
 
 void KItemListView::editRole(int index, const QByteArray& role)
 {

-    KItemListWidget* widget = m_visibleItems.value(index);
+    KStandardItemListWidget* widget = qobject_cast<KStandardItemListWidget *>(m_visibleItems.value(index));

     if (!widget || m_editingRole) {
         return;
     }
     if (!widget || m_editingRole) {
         return;
     }


@@ -646,6 +654,9 @@ void KItemListView::editRole(int index, const QByteArray& role)
             this, &KItemListView::slotRoleEditingCanceled);
     connect(widget, &KItemListWidget::roleEditingFinished,
             this, &KItemListView::slotRoleEditingFinished);
             this, &KItemListView::slotRoleEditingCanceled);
     connect(widget, &KItemListWidget::roleEditingFinished,
             this, &KItemListView::slotRoleEditingFinished);

+
+    connect(this, &KItemListView::scrollOffsetChanged,
+            widget, &KStandardItemListWidget::finishRoleEditing);

 }
 
 void KItemListView::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
 }
 
 void KItemListView::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)


@@ -941,7 +952,7 @@ void KItemListView::dragEnterEvent(QGraphicsSceneDragDropEvent* event)
     setAutoScroll(true);
 }
 
     setAutoScroll(true);
 }
 

-void KItemListView::dragMoveEvent(QGraphicsSceneDragDropEvent *event)
+void KItemListView::dragMoveEvent(QGraphicsSceneDragDropEvent* event)

 {
     QGraphicsWidget::dragMoveEvent(event);
 
 {
     QGraphicsWidget::dragMoveEvent(event);
 


@@ -951,7 +962,7 @@ void KItemListView::dragMoveEvent(QGraphicsSceneDragDropEvent *event)
     }
 }
 
     }
 }
 

-void KItemListView::dragLeaveEvent(QGraphicsSceneDragDropEvent *event)
+void KItemListView::dragLeaveEvent(QGraphicsSceneDragDropEvent* event)

 {
     QGraphicsWidget::dragLeaveEvent(event);
     setAutoScroll(false);
 {
     QGraphicsWidget::dragLeaveEvent(event);
     setAutoScroll(false);


@@ -1012,7 +1023,7 @@ void KItemListView::slotItemsInserted(const KItemRangeList& itemRanges)
         const int index = range.index + previouslyInsertedCount;
         const int count = range.count;
         if (index < 0 || count <= 0) {
         const int index = range.index + previouslyInsertedCount;
         const int count = range.count;
         if (index < 0 || count <= 0) {

-            kWarning() << "Invalid item range (index:" << index << ", count:" << count << ")";
+            qCWarning(DolphinDebug) << "Invalid item range (index:" << index << ", count:" << count << ")";

             continue;
         }
         previouslyInsertedCount += count;
             continue;
         }
         previouslyInsertedCount += count;


@@ -1053,11 +1064,17 @@ void KItemListView::slotItemsInserted(const KItemRangeList& itemRanges)
                                               (!verticalScrollOrientation && maximumScrollOffset() > size().width());
             if (decreaseLayouterSize) {
                 const int scrollBarExtent = style()->pixelMetric(QStyle::PM_ScrollBarExtent);
                                               (!verticalScrollOrientation && maximumScrollOffset() > size().width());
             if (decreaseLayouterSize) {
                 const int scrollBarExtent = style()->pixelMetric(QStyle::PM_ScrollBarExtent);

+
+                int scrollbarSpacing = 0;
+                if (style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents)) {
+                    scrollbarSpacing = style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarSpacing);
+                }
+

                 QSizeF layouterSize = m_layouter->size();
                 if (verticalScrollOrientation) {
                 QSizeF layouterSize = m_layouter->size();
                 if (verticalScrollOrientation) {

-                    layouterSize.rwidth() -= scrollBarExtent;
+                    layouterSize.rwidth() -= scrollBarExtent + scrollbarSpacing;

                 } else {
                 } else {

-                    layouterSize.rheight() -= scrollBarExtent;
+                    layouterSize.rheight() -= scrollBarExtent + scrollbarSpacing;

                 }
                 m_layouter->setSize(layouterSize);
             }
                 }
                 m_layouter->setSize(layouterSize);
             }


@@ -1114,14 +1131,14 @@ void KItemListView::slotItemsRemoved(const KItemRangeList& itemRanges)
         const int index = range.index;
         const int count = range.count;
         if (index < 0 || count <= 0) {
         const int index = range.index;
         const int count = range.count;
         if (index < 0 || count <= 0) {

-            kWarning() << "Invalid item range (index:" << index << ", count:" << count << ")";
+            qCWarning(DolphinDebug) << "Invalid item range (index:" << index << ", count:" << count << ")";

             continue;
         }
 
         const int firstRemovedIndex = index;
         const int lastRemovedIndex = index + count - 1;
 
             continue;
         }
 
         const int firstRemovedIndex = index;
         const int lastRemovedIndex = index + count - 1;
 

-        // Remeber which items have to be moved because they are behind the removed range.
+        // Remember which items have to be moved because they are behind the removed range.

         QVector<int> itemsToMove;
 
         // Remove all KItemListWidget instances that got deleted
         QVector<int> itemsToMove;
 
         // Remove all KItemListWidget instances that got deleted


@@ -1267,9 +1284,12 @@ void KItemListView::slotItemsChanged(const KItemRangeList& itemRanges,
             updateVisibleGroupHeaders();
             doLayout(NoAnimation);
         }
             updateVisibleGroupHeaders();
             doLayout(NoAnimation);
         }

+
+        QAccessibleTableModelChangeEvent ev(this, QAccessibleTableModelChangeEvent::DataChanged);
+        ev.setFirstRow(itemRange.index);
+        ev.setLastRow(itemRange.index + itemRange.count);
+        QAccessible::updateAccessibility(&ev);

     }
     }

-#pragma message("TODO: port accessibility otherwise the following line asserts")
-    //QAccessible::updateAccessibility(this, 0, QAccessible::TableModelChanged);

 }
 
 void KItemListView::slotGroupsChanged()
 }
 
 void KItemListView::slotGroupsChanged()


@@ -1332,17 +1352,23 @@ void KItemListView::slotCurrentChanged(int current, int previous)
 {
     Q_UNUSED(previous);
 
 {
     Q_UNUSED(previous);
 

-    KItemListWidget* previousWidget = m_visibleItems.value(previous, 0);
-    if (previousWidget) {
-        previousWidget->setCurrent(false);
-    }
+    // In SingleSelection mode (e.g., in the Places Panel), the current item is
+    // always the selected item. It is not necessary to highlight the current item then.
+    if (m_controller->selectionBehavior() != KItemListController::SingleSelection) {
+        KItemListWidget* previousWidget = m_visibleItems.value(previous, 0);
+        if (previousWidget) {
+            previousWidget->setCurrent(false);
+        }

 
 

-    KItemListWidget* currentWidget = m_visibleItems.value(current, 0);
-    if (currentWidget) {
-        currentWidget->setCurrent(true);
+        KItemListWidget* currentWidget = m_visibleItems.value(current, 0);
+        if (currentWidget) {
+            currentWidget->setCurrent(true);
+        }

     }
     }

-#pragma message("TODO: port accessibility otherwise the following line asserts")
-    //QAccessible::updateAccessibility(this, current+1, QAccessible::Focus);
+
+    QAccessibleEvent ev(this, QAccessible::Focus);
+    ev.setChild(current);
+    QAccessible::updateAccessibility(&ev);

 }
 
 void KItemListView::slotSelectionChanged(const KItemSet& current, const KItemSet& previous)
 }
 
 void KItemListView::slotSelectionChanged(const KItemSet& current, const KItemSet& previous)


@@ -1979,7 +2005,12 @@ void KItemListView::updateWidgetProperties(KItemListWidget* widget, int index)
     widget->setStyleOption(m_styleOption);
 
     const KItemListSelectionManager* selectionManager = m_controller->selectionManager();
     widget->setStyleOption(m_styleOption);
 
     const KItemListSelectionManager* selectionManager = m_controller->selectionManager();

-    widget->setCurrent(index == selectionManager->currentItem());
+
+    // In SingleSelection mode (e.g., in the Places Panel), the current item is
+    // always the selected item. It is not necessary to highlight the current item then.
+    if (m_controller->selectionBehavior() != KItemListController::SingleSelection) {
+        widget->setCurrent(index == selectionManager->currentItem());
+    }

     widget->setSelected(selectionManager->isSelected(index));
     widget->setHovered(false);
     widget->setEnabledSelectionToggle(enabledSelectionToggles());
     widget->setSelected(selectionManager->isSelected(index));
     widget->setHovered(false);
     widget->setEnabledSelectionToggle(enabledSelectionToggles());


@@ -2423,7 +2454,7 @@ int KItemListView::showDropIndicator(const QPointF& pos)
         if (mappedPos.y() >= 0 && mappedPos.y() <= rect.height()) {
             if (m_model->supportsDropping(widget->index())) {
                 // Keep 30% of the rectangle as the gap instead of always having a fixed gap
         if (mappedPos.y() >= 0 && mappedPos.y() <= rect.height()) {
             if (m_model->supportsDropping(widget->index())) {
                 // Keep 30% of the rectangle as the gap instead of always having a fixed gap

-                const int gap = qMax(4.0, 0.3 * rect.height());
+                const int gap = qMax(qreal(4.0), qreal(0.3) * rect.height());

                 if (mappedPos.y() >= gap && mappedPos.y() <= rect.height() - gap) {
                     return -1;
                 }
                 if (mappedPos.y() >= gap && mappedPos.y() <= rect.height() - gap) {
                     return -1;
                 }


@@ -2611,13 +2642,14 @@ bool KItemListView::hasSiblingSuccessor(int index) const
 
 void KItemListView::disconnectRoleEditingSignals(int index)
 {
 
 void KItemListView::disconnectRoleEditingSignals(int index)
 {

-    KItemListWidget* widget = m_visibleItems.value(index);
+    KStandardItemListWidget* widget = qobject_cast<KStandardItemListWidget *>(m_visibleItems.value(index));

     if (!widget) {
         return;
     }
 
     disconnect(widget, &KItemListWidget::roleEditingCanceled, this, nullptr);
     disconnect(widget, &KItemListWidget::roleEditingFinished, this, nullptr);
     if (!widget) {
         return;
     }
 
     disconnect(widget, &KItemListWidget::roleEditingCanceled, this, nullptr);
     disconnect(widget, &KItemListWidget::roleEditingFinished, this, nullptr);

+    disconnect(this, &KItemListView::scrollOffsetChanged, widget, nullptr);

 }
 
 int KItemListView::calculateAutoScrollingIncrement(int pos, int range, int oldInc)
 }
 
 int KItemListView::calculateAutoScrollingIncrement(int pos, int range, int oldInc)


@@ -2711,4 +2743,3 @@ void KItemListGroupHeaderCreatorBase::recycle(KItemListGroupHeader* header)
     pushRecycleableWidget(header);
 }
 
     pushRecycleableWidget(header);
 }
 

-#include "kitemlistview.moc"