Avoid some unnecessary composer legend updates

(cherry-picked from aaa654f)
qgis · Jul 19, 2016 · d3d202b92dd6e031d7e7a26c1b7a2257332c235b · d3d202b
1 parent f350048
commit d3d202b92dd6e031d7e7a26c1b7a2257332c235b
Showing with 5 additions and 0 deletions.

+3 −0 src/app/composer/qgscomposerlegendwidget.cpp

+2 −0 src/core/composer/qgscomposerlegend.cpp
diff --git a/src/app/composer/qgscomposerlegendwidget.cpp b/src/app/composer/qgscomposerlegendwidget.cpp
@@ -884,6 +884,9 @@ void QgsComposerLegendWidget::blockAllSignals( bool b )
   mRasterBorderGroupBox->blockSignals( b );
   mRasterBorderColorButton->blockSignals( b );
   mRasterBorderWidthSpinBox->blockSignals( b );
+  mWmsLegendWidthSpinBox->blockSignals( b );
+  mWmsLegendHeightSpinBox->blockSignals( b );
+  mTitleSpaceBottomSpinBox->blockSignals( b );
 }
 
 void QgsComposerLegendWidget::selectedChanged( const QModelIndex & current, const QModelIndex & previous )

diff --git a/src/core/composer/qgscomposerlegend.cpp b/src/core/composer/qgscomposerlegend.cpp
@@ -298,7 +298,9 @@ void QgsComposerLegend::synchronizeWithModel()
 void QgsComposerLegend::updateLegend()
 {
   // take layer list from map renderer (to have legend order)
+  mLegendModel.blockSignals( true );
   mLegendModel.setLayerSet( mComposition ? mComposition->mapSettings().layers() : QStringList() );
+  mLegendModel.blockSignals( false );
   adjustBoxSize();
   updateItem();
 }