Keep attribute dialog in front

Fix #15103
qgis · Jun 23, 2016 · 0783e8f · 0783e8f
1 parent 232fb84
commit 0783e8f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/app/qgisappinterface.cpp b/src/app/qgisappinterface.cpp
@@ -689,7 +689,7 @@ QgsAttributeDialog* QgisAppInterface::getFeatureForm( QgsVectorLayer *l, QgsFeat
   QgsAttributeEditorContext context;
   context.setDistanceArea( myDa );
   context.setVectorLayerTools( qgis->vectorLayerTools() );
-  QgsAttributeDialog *dialog = new QgsAttributeDialog( l, &feature, false, nullptr, true, context );
+  QgsAttributeDialog *dialog = new QgsAttributeDialog( l, &feature, false, qgis, true, context );
   if ( !feature.isValid() )
   {
     dialog->setIsAddDialog( true );

diff --git a/src/app/qgsfeatureaction.cpp b/src/app/qgsfeatureaction.cpp
@@ -61,7 +61,8 @@ QgsAttributeDialog *QgsFeatureAction::newDialog( bool cloneFeature )
   context.setVectorLayerTools( QgisApp::instance()->vectorLayerTools() );
   context.setFormMode( QgsAttributeEditorContext::StandaloneDialog );
 
-  QgsAttributeDialog *dialog = new QgsAttributeDialog( mLayer, f, cloneFeature, nullptr, true, context );
+  QgsAttributeDialog *dialog = new QgsAttributeDialog( mLayer, f, cloneFeature, parentWidget(), true, context );
+  dialog->setWindowFlags( dialog->windowFlags() | Qt::WindowStaysOnTopHint );
 
   if ( mLayer->actions()->size() > 0 )
   {