Fix crash in Compact View if view height is smaller then item height

CCBUG: 292816
FIXED-IN: 4.8.1
(cherry picked from commit f5ecaee9c40c940fe8e1bf4a7d50fe0b18e1932b)

diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index 578865741846ce725fbae4d450aa5249ef56dc35..4b2c742d98d95d9a6fce0690354a3abba79be935 100644 (file)
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -508,18 +508,16 @@ void KItemListView::scrollToItem(int index)
 
     if (!viewGeometry.contains(currentRect)) {
         qreal newOffset = scrollOffset();
-        if (currentRect.top() < viewGeometry.top()) {
-            Q_ASSERT(scrollOrientation() == Qt::Vertical);
-            newOffset += currentRect.top() - viewGeometry.top();
-        } else if ((currentRect.bottom() > viewGeometry.bottom())) {
-            Q_ASSERT(scrollOrientation() == Qt::Vertical);
-            newOffset += currentRect.bottom() - viewGeometry.bottom();
-        } else if (currentRect.left() < viewGeometry.left()) {
-            if (scrollOrientation() == Qt::Horizontal) {
-                newOffset += currentRect.left() - viewGeometry.left();
+        if (scrollOrientation() == Qt::Vertical) {
+            if (currentRect.top() < viewGeometry.top()) {
+                newOffset += currentRect.top() - viewGeometry.top();
+            } else if (currentRect.bottom() > viewGeometry.bottom()) {
+                newOffset += currentRect.bottom() - viewGeometry.bottom();
             }
-        } else if ((currentRect.right() > viewGeometry.right())) {
-            if (scrollOrientation() == Qt::Horizontal) {
+        } else {
+            if (currentRect.left() < viewGeometry.left()) {
+                newOffset += currentRect.left() - viewGeometry.left();
+            } else if (currentRect.right() > viewGeometry.right()) {
                 newOffset += currentRect.right() - viewGeometry.right();
             }
         }