A simple click is enough to create auxiliary layer and display "chang…

…e label properties" window
qgis · Oct 9, 2017 · fd455f6 · fd455f6
1 parent 34ac1ec
commit fd455f6
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/app/qgsmaptoolchangelabelproperties.cpp b/src/app/qgsmaptoolchangelabelproperties.cpp
@@ -63,14 +63,20 @@ void QgsMapToolChangeLabelProperties::canvasPressEvent( QgsMapMouseEvent *e )
     return;
   }
 
+  createRubberBands();
+
   if ( !mCurrentLabel.layer->isEditable() )
   {
     QgsPalIndexes indexes;
-    if ( createAuxiliaryFields( indexes ) )
-      return;
-  }
+    bool newAuxiliaryLayer = createAuxiliaryFields( indexes );
 
-  createRubberBands();
+    // in case of a new auxiliary layer, a dialog window is displayed and the
+    // canvas release event is lost.
+    if ( newAuxiliaryLayer )
+    {
+      canvasReleaseEvent( e );
+    }
+  }
 }
 
 void QgsMapToolChangeLabelProperties::canvasReleaseEvent( QgsMapMouseEvent *e )