Fix double redraw after applying vector properties

qgis · Feb 5, 2013 · 89bdb10 · 89bdb10
1 parent 18cd145
commit 89bdb10
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -359,15 +359,20 @@ void QgsLabelingGui::collapseSample( QgsCollapsibleGroupBox* grpbx )
 
 void QgsLabelingGui::apply()
 {
-  QgsPalLayerSettings settings = layerSettings();
-  settings.writeToLayer( mLayer );
+  writeSettingsToLayer();
   // trigger refresh
   if ( mMapCanvas )
   {
     mMapCanvas->refresh();
   }
 }
 
+void QgsLabelingGui::writeSettingsToLayer()
+{
+  QgsPalLayerSettings settings = layerSettings();
+  settings.writeToLayer( mLayer );
+}
+
 QgsPalLayerSettings QgsLabelingGui::layerSettings()
 {
   QgsPalLayerSettings lyr;

diff --git a/src/app/qgslabelinggui.h b/src/app/qgslabelinggui.h
@@ -37,6 +37,7 @@ class QgsLabelingGui : public QWidget, private Ui::QgsLabelingGuiBase
     ~QgsLabelingGui();
 
     QgsPalLayerSettings layerSettings();
+    void writeSettingsToLayer();
 
   public slots:
     void collapseSample( QgsCollapsibleGroupBox* grpbx );

diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -425,7 +425,9 @@ void QgsVectorLayerProperties::reset( void )
 void QgsVectorLayerProperties::apply()
 {
   if ( labelingDialog )
-    labelingDialog->apply();
+  {
+    labelingDialog->writeSettingsToLayer();
+  }
 
   //
   // Set up sql subset query if applicable