[node editor] Restore node editor panel postion/docked state

nirvn · nirvn · commit 2cfbb28ddbdf · 2019-01-23T18:34:03.000+07:00
diff --git a/src/app/vertextool/qgsvertextool.cpp b/src/app/vertextool/qgsvertextool.cpp
@@ -1078,13 +1078,21 @@ void QgsVertexTool::showVertexEditor()  //#spellok
   if ( !mVertexEditor )
   {
     mVertexEditor.reset( new QgsVertexEditor( m.layer() ? m.layer() : currentVectorLayer(), mSelectedFeature ? mSelectedFeature.get() : nullptr, mCanvas ) );
-    QgisApp::instance()->addDockWidget( Qt::LeftDockWidgetArea, mVertexEditor.get() );
+    if ( !QgisApp::instance()->restoreDockWidget( mVertexEditor.get() ) )
+      QgisApp::instance()->addDockWidget( Qt::LeftDockWidgetArea, mVertexEditor.get() );
+
     connect( mVertexEditor.get(), &QgsVertexEditor::deleteSelectedRequested, this, &QgsVertexTool::deleteVertexEditorSelection );
     connect( mVertexEditor.get(), &QgsVertexEditor::editorClosed, this, &QgsVertexTool::cleanupVertexEditor );
+
+    mVertexEditor->show();
+    mVertexEditor->raise();
   }
   else
   {
     mVertexEditor->updateEditor( m.layer(), mSelectedFeature.get() );
+
+    mVertexEditor->show();
+    mVertexEditor->raise();
   }
 
   if ( mSelectedFeature )

Original file line number	Diff line number	Diff line change
`@@ -1078,13 +1078,21 @@ void QgsVertexTool::showVertexEditor() //#spellok`
`1078`	`1078`	`if ( !mVertexEditor )`
`1079`	`1079`	`{`
`1080`	`1080`	`mVertexEditor.reset( new QgsVertexEditor( m.layer() ? m.layer() : currentVectorLayer(), mSelectedFeature ? mSelectedFeature.get() : nullptr, mCanvas ) );`
`1081`		`- QgisApp::instance()->addDockWidget( Qt::LeftDockWidgetArea, mVertexEditor.get() );`
	`1081`	`+ if ( !QgisApp::instance()->restoreDockWidget( mVertexEditor.get() ) )`
	`1082`	`+ QgisApp::instance()->addDockWidget( Qt::LeftDockWidgetArea, mVertexEditor.get() );`
	`1083`	`+`
`1082`	`1084`	`connect( mVertexEditor.get(), &QgsVertexEditor::deleteSelectedRequested, this, &QgsVertexTool::deleteVertexEditorSelection );`
`1083`	`1085`	`connect( mVertexEditor.get(), &QgsVertexEditor::editorClosed, this, &QgsVertexTool::cleanupVertexEditor );`
	`1086`	`+`
	`1087`	`+ mVertexEditor->show();`
	`1088`	`+ mVertexEditor->raise();`
`1084`	`1089`	`}`
`1085`	`1090`	`else`
`1086`	`1091`	`{`
`1087`	`1092`	`mVertexEditor->updateEditor( m.layer(), mSelectedFeature.get() );`
	`1093`	`+`
	`1094`	`+ mVertexEditor->show();`
	`1095`	`+ mVertexEditor->raise();`
`1088`	`1096`	`}`
`1089`	`1097`
`1090`	`1098`	`if ( mSelectedFeature )`