From ee7a404ae1ff79514650e305fcdfeb80d375a95d Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Wed, 1 Nov 2017 12:48:41 +0100
Subject: [PATCH] adjusting the stack order inside layouts to have a proper tab
 focus chain

---
 src/layouts/QskLayout.cpp | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/layouts/QskLayout.cpp b/src/layouts/QskLayout.cpp
index a37723e7..96368dcc 100644
--- a/src/layouts/QskLayout.cpp
+++ b/src/layouts/QskLayout.cpp
@@ -92,6 +92,11 @@ void QskLayout::insertItemInternal( QskLayoutItem* layoutItem, int index )
 
     QQuickItem* item = layoutItem->item();
 
+    if ( index > itemCount() )
+        index = -1; // append
+
+    QskLayoutEngine& engine = this->engine();
+
     if ( item )
     {
         if ( item->parent() == nullptr )
@@ -99,12 +104,21 @@ void QskLayout::insertItemInternal( QskLayoutItem* layoutItem, int index )
 
         if ( item->parentItem() != this )
             item->setParentItem( this );
+
+        if ( index >= 0 )
+        {
+            // to have a proper focus tab chain
+
+            for ( int i = index; i < engine.itemCount(); i++ )
+            {
+                QskLayoutItem* layoutItem = engine.layoutItemAt( index );
+                if ( layoutItem && layoutItem->item() )
+                    item->stackBefore( layoutItem->item() );
+            }
+        }
     }
 
-    if ( index > itemCount() )
-        index = -1; // append
-
-    engine().insertLayoutItem( layoutItem, index );
+    engine.insertLayoutItem( layoutItem, index );
 
     if ( m_data->isActive )
     {