Fix loss of layout item combo box filters

qgis · Mar 11, 2019 · d890084 · d890084
1 parent 41d8a9c
commit d890084
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/gui/layout/qgslayoutitemcombobox.cpp b/src/gui/layout/qgslayoutitemcombobox.cpp
@@ -28,13 +28,16 @@ QgsLayoutItemComboBox::QgsLayoutItemComboBox( QWidget *parent, QgsLayout *layout
 void QgsLayoutItemComboBox::setCurrentLayout( QgsLayout *layout )
 {
   const bool prevAllowEmpty = mProxyModel && mProxyModel->allowEmptyItem();
+  int itemType = mProxyModel ? mProxyModel->filterType() : -1;
   mProxyModel = qgis::make_unique< QgsLayoutProxyModel >( layout, this );
   connect( mProxyModel.get(), &QAbstractItemModel::rowsInserted, this, &QgsLayoutItemComboBox::rowsChanged );
   connect( mProxyModel.get(), &QAbstractItemModel::rowsRemoved, this, &QgsLayoutItemComboBox::rowsChanged );
   setModel( mProxyModel.get() );
   setModelColumn( QgsLayoutModel::ItemId );
   mProxyModel->sort( QgsLayoutModel::ItemId, Qt::AscendingOrder );
   mProxyModel->setAllowEmptyItem( prevAllowEmpty );
+  if ( itemType >= 0 )
+    mProxyModel->setFilterType( static_cast< QgsLayoutItemRegistry::ItemType >( itemType ) );
 }
 
 QgsLayout *QgsLayoutItemComboBox::currentLayout()