Fix broken apply button in label config dialog (fix #13543)

qgis · Oct 14, 2015 · f50e1a7 · f50e1a7
1 parent fdbdd78
commit f50e1a7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -5237,7 +5237,7 @@ void QgisApp::labeling()
 
   connect( buttonBox->button( QDialogButtonBox::Ok ), SIGNAL( clicked() ), &dlg, SLOT( accept() ) );
   connect( buttonBox->button( QDialogButtonBox::Cancel ), SIGNAL( clicked() ), &dlg, SLOT( reject() ) );
-  connect( buttonBox->button( QDialogButtonBox::Apply ), SIGNAL( clicked() ), labelingGui, SLOT( writeSettingsToLayer() ) );
+  connect( buttonBox->button( QDialogButtonBox::Apply ), SIGNAL( clicked() ), labelingGui, SLOT( apply() ) );
 
   if ( dlg.exec() )
   {

diff --git a/src/app/qgslabelingwidget.cpp b/src/app/qgslabelingwidget.cpp
@@ -4,6 +4,7 @@
 #include "qgslabelinggui.h"
 #include "qgsrulebasedlabelingwidget.h"
 #include "qgsvectorlayerlabeling.h"
+#include "qgisapp.h"
 
 QgsLabelingWidget::QgsLabelingWidget( QgsVectorLayer* layer, QgsMapCanvas* canvas, QWidget* parent )
     : QWidget( parent )
@@ -54,6 +55,16 @@ void QgsLabelingWidget::writeSettingsToLayer()
   }
 }
 
+void QgsLabelingWidget::apply()
+{
+  writeSettingsToLayer();
+  QgisApp::instance()->markDirty();
+  // trigger refresh
+  if ( mCanvas )
+  {
+    mCanvas->refresh();
+  }
+}
 
 void QgsLabelingWidget::labelModeChanged( int index )
 {

diff --git a/src/app/qgslabelingwidget.h b/src/app/qgslabelingwidget.h
@@ -23,6 +23,9 @@ class QgsLabelingWidget : public QWidget, private Ui::QgsLabelingWidget
     //! save config to layer
     void writeSettingsToLayer();
 
+    //! Saves the labeling configuration and immediately updates the map canvas to reflect the changes
+    void apply();
+
   protected slots:
     void labelModeChanged( int index );
     void showEngineConfigDialog();