Fix rotation widget disappears after ctrl-clicking to set anchor point

nyalldawson · 3nids · commit 912bbe3e5ed4 · 2018-01-22T06:57:32.000-09:00
Fixes #17232
diff --git a/src/app/qgsmaptoolrotatefeature.cpp b/src/app/qgsmaptoolrotatefeature.cpp
@@ -167,8 +167,6 @@ void QgsMapToolRotateFeature::canvasMoveEvent( QgsMapMouseEvent *e )
 
 void QgsMapToolRotateFeature::canvasReleaseEvent( QgsMapMouseEvent *e )
 {
-  deleteRotationWidget();
-
   if ( !mCanvas )
   {
     return;
@@ -177,15 +175,15 @@ void QgsMapToolRotateFeature::canvasReleaseEvent( QgsMapMouseEvent *e )
   QgsVectorLayer *vlayer = currentVectorLayer();
   if ( !vlayer )
   {
+    deleteRotationWidget();
     deleteRubberband();
     notifyNotVectorLayer();
     return;
   }
 
   if ( e->button() == Qt::RightButton )
   {
-    deleteRubberband();
-    mRotationActive = false;
+    cancel();
     return;
   }
 
@@ -202,6 +200,8 @@ void QgsMapToolRotateFeature::canvasReleaseEvent( QgsMapMouseEvent *e )
     return;
   }
 
+  deleteRotationWidget();
+
   // Initialize rotation if not yet active
   if ( !mRotationActive )
   {

Original file line number	Diff line number	Diff line change
`@@ -167,8 +167,6 @@ void QgsMapToolRotateFeature::canvasMoveEvent( QgsMapMouseEvent *e )`
`167`	`167`
`168`	`168`	`void QgsMapToolRotateFeature::canvasReleaseEvent( QgsMapMouseEvent *e )`
`169`	`169`	`{`
`170`		`- deleteRotationWidget();`
`171`		`-`
`172`	`170`	`if ( !mCanvas )`
`173`	`171`	`{`
`174`	`172`	`return;`
`@@ -177,15 +175,15 @@ void QgsMapToolRotateFeature::canvasReleaseEvent( QgsMapMouseEvent *e )`
`177`	`175`	`QgsVectorLayer *vlayer = currentVectorLayer();`
`178`	`176`	`if ( !vlayer )`
`179`	`177`	`{`
	`178`	`+ deleteRotationWidget();`
`180`	`179`	`deleteRubberband();`
`181`	`180`	`notifyNotVectorLayer();`
`182`	`181`	`return;`
`183`	`182`	`}`
`184`	`183`
`185`	`184`	`if ( e->button() == Qt::RightButton )`
`186`	`185`	`{`
`187`		`- deleteRubberband();`
`188`		`- mRotationActive = false;`
	`186`	`+ cancel();`
`189`	`187`	`return;`
`190`	`188`	`}`
`191`	`189`
`@@ -202,6 +200,8 @@ void QgsMapToolRotateFeature::canvasReleaseEvent( QgsMapMouseEvent *e )`
`202`	`200`	`return;`
`203`	`201`	`}`
`204`	`202`
	`203`	`+ deleteRotationWidget();`
	`204`	`+`
`205`	`205`	`// Initialize rotation if not yet active`
`206`	`206`	`if ( !mRotationActive )`
`207`	`207`	`{`