From 19364a7beb85e124eba4f6b9b69846bf2b129e6f Mon Sep 17 00:00:00 2001
From: Benjamin Arnaud <benjamin.arnaud@videolabs.io>
Date: Thu, 9 Jun 2022 15:54:20 +0200
Subject: [PATCH] qml/ExpandGridView: Do not force header on the first row

fix #26273
---
 modules/gui/qt/widgets/qml/ExpandGridView.qml | 29 +++++++------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/modules/gui/qt/widgets/qml/ExpandGridView.qml b/modules/gui/qt/widgets/qml/ExpandGridView.qml
index f4f7766824..77889bd77c 100644
--- a/modules/gui/qt/widgets/qml/ExpandGridView.qml
+++ b/modules/gui/qt/widgets/qml/ExpandGridView.qml
@@ -344,17 +344,10 @@ FocusScope {
     //use the same signature as Gridview.positionViewAtIndex(index, PositionMode mode)
     //mode is ignored at the moment
     function positionViewAtIndex(index, mode) {
-        if (flickable.width === 0 || flickable.height === 0)
-            return
-
-        if (index <= 0) {
-            animateFlickableContentY(0)
+        if (flickable.width === 0 || flickable.height === 0
+            ||
+            index < 0 || index >= _count)
             return
-        } else if (index >= _count) {
-            return
-        }
-
-        var newContentY = flickable.contentY
 
         var itemTopY = getItemPos(index)[1]
         var itemBottomY = itemTopY + _effectiveCellHeight
@@ -362,16 +355,16 @@ FocusScope {
         var viewTopY = flickable.contentY
         var viewBottomY = viewTopY + flickable.height
 
-        if (index < _nbItemPerRow) {
-            //force to see the header when on the first row
-            newContentY = 0
-        } else if ( itemTopY < viewTopY ) {
-            //item above view
+        var newContentY
+
+        if (itemTopY < viewTopY)
+             //item above view
             newContentY = itemTopY - topMargin
-        } else if (itemBottomY > viewBottomY) {
-            //item below view
+        else if (itemBottomY > viewBottomY)
+             //item below view
             newContentY = itemBottomY + bottomMargin - flickable.height
-        }
+        else
+            newContentY = flickable.contentY
 
         if (newContentY !== flickable.contentY)
             animateFlickableContentY(newContentY)