Merge branch 'master' into kf6

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

diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp
index be7a63e0993b43b16e0b5e8564fdb568999034d7..5abf1830be349f2bd397e302920ffbfb3beef259 100644 (file)
--- a/src/kitemviews/kitemlistcontroller.cpp
+++ b/src/kitemviews/kitemlistcontroller.cpp
@@ -539,7 +539,7 @@ void KItemListController::slotChangeCurrentItem(const QString &text, bool search
             m_selectionManager->beginAnchoredSelection(index);
         }
 
-        m_view->scrollToItem(index);
+        m_view->scrollToItem(index, KItemListView::ViewItemPosition::Beginning);
     }
 }
 
@@ -1299,7 +1299,8 @@ void KItemListController::slotRubberBandChanged()
         if (widgetRect.intersects(rubberBandRect)) {
             // Select the full row intersecting with the rubberband rectangle
             const QRectF selectionRect = widget->selectionRect().translated(widgetRect.topLeft());
-            if (selectionRect.intersects(rubberBandRect)) {
+            const QRectF iconRect = widget->iconRect().translated(widgetRect.topLeft());
+            if (selectionRect.intersects(rubberBandRect) || iconRect.intersects(rubberBandRect)) {
                 selectedItems.insert(index);
             }
         }