[composer] Instant feedback for legend when linked map changes

nyalldawson · nyalldawson · commit f9ff5e25d3eb · 2016-06-16T18:30:22.000+10:00
diff --git a/src/core/composer/qgscomposerlegend.cpp b/src/core/composer/qgscomposerlegend.cpp
@@ -305,7 +305,7 @@ void QgsComposerLegend::updateLegend()
 
 void QgsComposerLegend::updateItem()
 {
-  updateFilterByMap();
+  updateFilterByMap( false );
   QgsComposerItem::updateItem();
 }
 
@@ -604,7 +604,7 @@ void QgsComposerLegend::mapLayerStyleOverridesChanged()
   {
     // legend is being filtered by map, so we need to re run the hit test too
     // as the style overrides may also have affected the visible symbols
-    updateFilterByMap();
+    updateFilterByMap( false );
   }
   else
   {
@@ -618,14 +618,17 @@ void QgsComposerLegend::mapLayerStyleOverridesChanged()
   updateItem();
 }
 
-void QgsComposerLegend::updateFilterByMap()
+void QgsComposerLegend::updateFilterByMap( bool redraw )
 {
   if ( isRemoved() )
     return;
   // ask for update
   // the actual update will take place before the redraw.
   // This is to avoid multiple calls to the filter
   mFilterAskedForUpdate = true;
+
+  if ( redraw )
+    QgsComposerItem::updateItem();
 }
 
 void QgsComposerLegend::doUpdateFilterByMap()
diff --git a/src/core/composer/qgscomposerlegend.h b/src/core/composer/qgscomposerlegend.h
@@ -255,7 +255,7 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
     void invalidateCurrentMap();
 
   private slots:
-    void updateFilterByMap();
+    void updateFilterByMap( bool redraw = true );
 
     //! update legend in case style of associated map has changed
     void mapLayerStyleOverridesChanged();

Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ void QgsComposerLegend::updateLegend()`
`305`	`305`
`306`	`306`	`void QgsComposerLegend::updateItem()`
`307`	`307`	`{`
`308`		`- updateFilterByMap();`
	`308`	`+ updateFilterByMap( false );`
`309`	`309`	`QgsComposerItem::updateItem();`
`310`	`310`	`}`
`311`	`311`
`@@ -604,7 +604,7 @@ void QgsComposerLegend::mapLayerStyleOverridesChanged()`
`604`	`604`	`{`
`605`	`605`	`// legend is being filtered by map, so we need to re run the hit test too`
`606`	`606`	`// as the style overrides may also have affected the visible symbols`
`607`		`- updateFilterByMap();`
	`607`	`+ updateFilterByMap( false );`
`608`	`608`	`}`
`609`	`609`	`else`
`610`	`610`	`{`
`@@ -618,14 +618,17 @@ void QgsComposerLegend::mapLayerStyleOverridesChanged()`
`618`	`618`	`updateItem();`
`619`	`619`	`}`
`620`	`620`
`621`		`-void QgsComposerLegend::updateFilterByMap()`
	`621`	`+void QgsComposerLegend::updateFilterByMap( bool redraw )`
`622`	`622`	`{`
`623`	`623`	`if ( isRemoved() )`
`624`	`624`	`return;`
`625`	`625`	`// ask for update`
`626`	`626`	`// the actual update will take place before the redraw.`
`627`	`627`	`// This is to avoid multiple calls to the filter`
`628`	`628`	`mFilterAskedForUpdate = true;`
	`629`	`+`
	`630`	`+ if ( redraw )`
	`631`	`+ QgsComposerItem::updateItem();`
`629`	`632`	`}`
`630`	`633`
`631`	`634`	`void QgsComposerLegend::doUpdateFilterByMap()`