Merge branch 'Applications/18.04'

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

diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index abde53904f86f55f0e4dcd4c3dce17997bce8fb1..f0647fb3eac23fc922532e447a4f20c541cbe3c1 100644 (file)
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -22,36 +22,25 @@
 
 #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 "kitemlistviewaccessible.h"
+#include "kstandarditemlistwidget.h"

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

-#include "private/kitemlistviewanimation.h"

 
 

-#include <QCursor>
+#include <QElapsedTimer>

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

-#include <QPainter>
-#include <QPropertyAnimation>
-#include <QStyle>

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

-#include <algorithm>
-
-#if 0
-#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 +52,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)
 


@@ -73,7 +62,7 @@ QAccessibleInterface* accessibleInterfaceFactory(const QString &key, QObject *ob
         return new KItemListViewAccessible(view);
     }
 
         return new KItemListViewAccessible(view);
     }
 

-    return 0;
+    return nullptr;

 }
 #endif
 
 }
 #endif
 


@@ -86,30 +75,30 @@ KItemListView::KItemListView(QGraphicsWidget* parent) :
     m_activeTransactions(0),
     m_endTransactionAnimationHint(Animation),
     m_itemSize(),
     m_activeTransactions(0),
     m_endTransactionAnimationHint(Animation),
     m_itemSize(),

-    m_controller(0),
-    m_model(0),
+    m_controller(nullptr),
+    m_model(nullptr),

     m_visibleRoles(),
     m_visibleRoles(),

-    m_widgetCreator(0),
-    m_groupHeaderCreator(0),
+    m_widgetCreator(nullptr),
+    m_groupHeaderCreator(nullptr),

     m_styleOption(),
     m_visibleItems(),
     m_visibleGroups(),
     m_visibleCells(),
     m_styleOption(),
     m_visibleItems(),
     m_visibleGroups(),
     m_visibleCells(),

-    m_sizeHintResolver(0),
-    m_layouter(0),
-    m_animation(0),
-    m_layoutTimer(0),
+    m_sizeHintResolver(nullptr),
+    m_layouter(nullptr),
+    m_animation(nullptr),
+    m_layoutTimer(nullptr),

     m_oldScrollOffset(0),
     m_oldMaximumScrollOffset(0),
     m_oldItemOffset(0),
     m_oldMaximumItemOffset(0),
     m_skipAutoScrollForRubberBand(false),
     m_oldScrollOffset(0),
     m_oldMaximumScrollOffset(0),
     m_oldItemOffset(0),
     m_oldMaximumItemOffset(0),
     m_skipAutoScrollForRubberBand(false),

-    m_rubberBand(0),
+    m_rubberBand(nullptr),

     m_mousePos(),
     m_autoScrollIncrement(0),
     m_mousePos(),
     m_autoScrollIncrement(0),

-    m_autoScrollTimer(0),
-    m_header(0),
-    m_headerWidget(0),
+    m_autoScrollTimer(nullptr),
+    m_header(nullptr),
+    m_headerWidget(nullptr),

     m_dropIndicator()
 {
     setAcceptHoverEvents(true);
     m_dropIndicator()
 {
     setAcceptHoverEvents(true);


@@ -147,13 +136,13 @@ KItemListView::~KItemListView()
     // widgetCreator(). So it is mandatory to delete the group headers
     // first.
     delete m_groupHeaderCreator;
     // widgetCreator(). So it is mandatory to delete the group headers
     // first.
     delete m_groupHeaderCreator;

-    m_groupHeaderCreator = 0;
+    m_groupHeaderCreator = nullptr;

 
     delete m_widgetCreator;
 
     delete m_widgetCreator;

-    m_widgetCreator = 0;
+    m_widgetCreator = nullptr;

 
     delete m_sizeHintResolver;
 
     delete m_sizeHintResolver;

-    m_sizeHintResolver = 0;
+    m_sizeHintResolver = nullptr;

 }
 
 void KItemListView::setScrollOffset(qreal offset)
 }
 
 void KItemListView::setScrollOffset(qreal offset)


@@ -276,13 +265,13 @@ void KItemListView::setAutoScroll(bool enabled)
         m_autoScrollTimer->start(InitialAutoScrollDelay);
     } else if (!enabled && m_autoScrollTimer) {
         delete m_autoScrollTimer;
         m_autoScrollTimer->start(InitialAutoScrollDelay);
     } else if (!enabled && m_autoScrollTimer) {
         delete m_autoScrollTimer;

-        m_autoScrollTimer = 0;
+        m_autoScrollTimer = nullptr;

     }
 }
 
 bool KItemListView::autoScroll() const
 {
     }
 }
 
 bool KItemListView::autoScroll() const
 {

-    return m_autoScrollTimer != 0;
+    return m_autoScrollTimer != nullptr;

 }
 
 void KItemListView::setEnabledSelectionToggles(bool enabled)
 }
 
 void KItemListView::setEnabledSelectionToggles(bool enabled)


@@ -315,9 +304,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 +318,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 +335,11 @@ QSizeF KItemListView::itemSize() const
     return m_itemSize;
 }
 
     return m_itemSize;
 }
 

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

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


@@ -454,6 +444,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 +467,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 +552,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) {


@@ -621,7 +624,7 @@ QPixmap KItemListView::createDragPixmap(const KItemSet& indexes) const
         KItemListWidget* item = m_visibleItems.value(indexes.first());
         QGraphicsView* graphicsView = scene()->views()[0];
         if (item && graphicsView) {
         KItemListWidget* item = m_visibleItems.value(indexes.first());
         QGraphicsView* graphicsView = scene()->views()[0];
         if (item && graphicsView) {

-            pixmap = item->createDragPixmap(0, graphicsView);
+            pixmap = item->createDragPixmap(nullptr, graphicsView);

         }
     } else {
         // TODO: Not implemented yet. Probably extend the interface
         }
     } else {
         // TODO: Not implemented yet. Probably extend the interface


@@ -634,7 +637,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 +649,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)


@@ -746,6 +752,10 @@ void KItemListView::setItemSize(const QSizeF& size)
 
 void KItemListView::setStyleOption(const KItemListStyleOption& option)
 {
 
 void KItemListView::setStyleOption(const KItemListStyleOption& option)
 {

+    if (m_styleOption == option) {
+        return;
+    }
+

     const KItemListStyleOption previousOption = m_styleOption;
     m_styleOption = option;
 
     const KItemListStyleOption previousOption = m_styleOption;
     m_styleOption = option;
 


@@ -765,7 +775,8 @@ void KItemListView::setStyleOption(const KItemListStyleOption& option)
         updateGroupHeaderHeight();
     }
 
         updateGroupHeaderHeight();
     }
 

-    if (animate && previousOption.maxTextSize != option.maxTextSize) {
+    if (animate &&
+        (previousOption.maxTextLines != option.maxTextLines || previousOption.maxTextWidth != option.maxTextWidth)) {

         // Animating a change of the maximum text size just results in expensive
         // temporary eliding and clipping operations and does not look good visually.
         animate = false;
         // Animating a change of the maximum text size just results in expensive
         // temporary eliding and clipping operations and does not look good visually.
         animate = false;


@@ -822,12 +833,12 @@ Qt::Orientation KItemListView::scrollOrientation() const
 
 KItemListWidgetCreatorBase* KItemListView::defaultWidgetCreator() const
 {
 
 KItemListWidgetCreatorBase* KItemListView::defaultWidgetCreator() const
 {

-    return 0;
+    return nullptr;

 }
 
 KItemListGroupHeaderCreatorBase* KItemListView::defaultGroupHeaderCreator() const
 {
 }
 
 KItemListGroupHeaderCreatorBase* KItemListView::defaultGroupHeaderCreator() const
 {

-    return 0;
+    return nullptr;

 }
 
 void KItemListView::initializeItemListWidget(KItemListWidget* item)
 }
 
 void KItemListView::initializeItemListWidget(KItemListWidget* item)


@@ -898,11 +909,23 @@ void KItemListView::onTransactionEnd()
 
 bool KItemListView::event(QEvent* event)
 {
 
 bool KItemListView::event(QEvent* event)
 {

-    // Forward all events to the controller and handle them there
-    if (!m_editingRole && m_controller && m_controller->processEvent(event, transform())) {
-        event->accept();
-        return true;
+    switch (event->type()) {
+    case QEvent::PaletteChange:
+        updatePalette();
+        break;
+
+    case QEvent::FontChange:
+        updateFont();
+        break;
+
+    default:
+        // Forward all other events to the controller and handle them there
+        if (!m_editingRole && m_controller && m_controller->processEvent(event, transform())) {
+            event->accept();
+            return true;
+        }

     }
     }

+

     return QGraphicsWidget::event(event);
 }
 
     return QGraphicsWidget::event(event);
 }
 


@@ -928,7 +951,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);
 


@@ -938,7 +961,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);


@@ -955,6 +978,27 @@ QList<KItemListWidget*> KItemListView::visibleItemListWidgets() const
     return m_visibleItems.values();
 }
 
     return m_visibleItems.values();
 }
 

+void KItemListView::updateFont()
+{
+    if (scene() && !scene()->views().isEmpty()) {
+        KItemListStyleOption option = styleOption();
+        option.font = scene()->views().first()->font();
+        option.fontMetrics = QFontMetrics(option.font);
+
+        setStyleOption(option);
+    }
+}
+
+void KItemListView::updatePalette()
+{
+    if (scene() && !scene()->views().isEmpty()) {
+        KItemListStyleOption option = styleOption();
+        option.palette = scene()->views().first()->palette();
+
+        setStyleOption(option);
+    }
+}
+

 void KItemListView::slotItemsInserted(const KItemRangeList& itemRanges)
 {
     if (m_itemSize.isEmpty()) {
 void KItemListView::slotItemsInserted(const KItemRangeList& itemRanges)
 {
     if (m_itemSize.isEmpty()) {


@@ -978,7 +1022,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;


@@ -1019,11 +1063,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);
             }


@@ -1080,14 +1130,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


@@ -1233,9 +1283,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()


@@ -1298,17 +1351,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)


@@ -1945,7 +2004,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());


@@ -2025,7 +2089,7 @@ void KItemListView::recycleGroupHeaderForWidget(KItemListWidget* widget)
 {
     KItemListGroupHeader* header = m_visibleGroups.value(widget);
     if (header) {
 {
     KItemListGroupHeader* header = m_visibleGroups.value(widget);
     if (header) {

-        header->setParentItem(0);
+        header->setParentItem(nullptr);

         groupHeaderCreator()->recycle(header);
         m_visibleGroups.remove(widget);
         disconnect(widget, &KItemListWidget::geometryChanged, this, &KItemListView::slotGeometryOfGroupHeaderParentChanged);
         groupHeaderCreator()->recycle(header);
         m_visibleGroups.remove(widget);
         disconnect(widget, &KItemListWidget::geometryChanged, this, &KItemListView::slotGeometryOfGroupHeaderParentChanged);


@@ -2389,7 +2453,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;
                 }


@@ -2486,7 +2550,7 @@ void KItemListView::updateSiblingsInformation(int firstIndex, int lastIndex)
             const int parents = m_model->expandedParentsCount(lastIndex + 1);
             for (int i = lastIndex; i >= firstIndex; --i) {
                 if (m_model->expandedParentsCount(i) != parents) {
             const int parents = m_model->expandedParentsCount(lastIndex + 1);
             for (int i = lastIndex; i >= firstIndex; --i) {
                 if (m_model->expandedParentsCount(i) != parents) {

-                    widget = 0;
+                    widget = nullptr;

                     break;
                 }
             }
                     break;
                 }
             }


@@ -2577,13 +2641,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)


@@ -2648,7 +2713,7 @@ void KItemListCreatorBase::pushRecycleableWidget(QGraphicsWidget* widget)
 QGraphicsWidget* KItemListCreatorBase::popRecycleableWidget()
 {
     if (m_recycleableWidgets.isEmpty()) {
 QGraphicsWidget* KItemListCreatorBase::popRecycleableWidget()
 {
     if (m_recycleableWidgets.isEmpty()) {

-        return 0;
+        return nullptr;

     }
 
     QGraphicsWidget* widget = m_recycleableWidgets.takeLast();
     }
 
     QGraphicsWidget* widget = m_recycleableWidgets.takeLast();


@@ -2662,7 +2727,7 @@ KItemListWidgetCreatorBase::~KItemListWidgetCreatorBase()
 
 void KItemListWidgetCreatorBase::recycle(KItemListWidget* widget)
 {
 
 void KItemListWidgetCreatorBase::recycle(KItemListWidget* widget)
 {

-    widget->setParentItem(0);
+    widget->setParentItem(nullptr);

     widget->setOpacity(1.0);
     pushRecycleableWidget(widget);
 }
     widget->setOpacity(1.0);
     pushRecycleableWidget(widget);
 }


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

-#include "kitemlistview.moc"