sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-03 00:02:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix loss of layout item combo box filters

Browse Source
This commit is contained in:
Nyall Dawson 2019-03-11 20:28:01 +10:00
parent 41d8a9c20b
commit d890084f63
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/layout/qgslayoutitemcombobox.cpp
View File

@ -28,6 +28,7 @@ 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 );
@ -35,6 +36,8 @@ void QgsLayoutItemComboBox::setCurrentLayout( QgsLayout *layout )
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()