Correctly sort items in QgsLayoutItemComboBOx

Author: nyalldawson

src/gui/layout/qgslayoutitemcombobox.cpp

@@ -33,7 +33,7 @@ void QgsLayoutItemComboBox::setCurrentLayout( QgsLayout *layout )
   connect( mProxyModel.get(), &QAbstractItemModel::rowsRemoved, this, &QgsLayoutItemComboBox::rowsChanged );
   setModel( mProxyModel.get() );
   setModelColumn( QgsLayoutModel::ItemId );
-  mProxyModel->sort( 0, Qt::AscendingOrder );
+  mProxyModel->sort( QgsLayoutModel::ItemId, Qt::AscendingOrder );
   mProxyModel->setAllowEmptyItem( prevAllowEmpty );
 }
 

tests/src/gui/testqgslayoutgui.cpp

@@ -133,6 +133,15 @@ void TestQgsLayoutGui::itemTypeComboBox()
   QCOMPARE( spy1.count(), expectedSpy1Count ); // must be unchanged from earlier
   QCOMPARE( spy2.count(), expectedSpy2Count );
 
+  item3->setId( "a" );
+  QCOMPARE( cb->itemText( 0 ), QStringLiteral( "a" ) );
+  QCOMPARE( cb->itemText( 1 ), QStringLiteral( "item 1" ) );
+  QCOMPARE( cb->itemText( 2 ), QStringLiteral( "item 2" ) );
+  item3->setId( "item 3" );
+  QCOMPARE( cb->itemText( 0 ), QStringLiteral( "item 1" ) );
+  QCOMPARE( cb->itemText( 1 ), QStringLiteral( "item 2" ) );
+  QCOMPARE( cb->itemText( 2 ), QStringLiteral( "item 3" ) );
+
   //manually change item
   cb->setItem( item3 );
   expectedSpy1Count++;