Keep attribute dialog in front

m-kuhn · m-kuhn · commit 0783e8fc1ddb · 2016-06-23T10:47:28.000+02:00
Fix #15103
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 )
   {

Original file line number	Diff line number	Diff line change
`@@ -689,7 +689,7 @@ QgsAttributeDialog* QgisAppInterface::getFeatureForm( QgsVectorLayer *l, QgsFeat`
`689`	`689`	`QgsAttributeEditorContext context;`
`690`	`690`	`context.setDistanceArea( myDa );`
`691`	`691`	`context.setVectorLayerTools( qgis->vectorLayerTools() );`
`692`		`- QgsAttributeDialog *dialog = new QgsAttributeDialog( l, &feature, false, nullptr, true, context );`
	`692`	`+ QgsAttributeDialog *dialog = new QgsAttributeDialog( l, &feature, false, qgis, true, context );`
`693`	`693`	`if ( !feature.isValid() )`
`694`	`694`	`{`
`695`	`695`	`dialog->setIsAddDialog( true );`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,8 @@ QgsAttributeDialog *QgsFeatureAction::newDialog( bool cloneFeature )`
`61`	`61`	`context.setVectorLayerTools( QgisApp::instance()->vectorLayerTools() );`
`62`	`62`	`context.setFormMode( QgsAttributeEditorContext::StandaloneDialog );`
`63`	`63`
`64`		`- QgsAttributeDialog *dialog = new QgsAttributeDialog( mLayer, f, cloneFeature, nullptr, true, context );`
	`64`	`+ QgsAttributeDialog *dialog = new QgsAttributeDialog( mLayer, f, cloneFeature, parentWidget(), true, context );`
	`65`	`+ dialog->setWindowFlags( dialog->windowFlags() \| Qt::WindowStaysOnTopHint );`
`65`	`66`
`66`	`67`	`if ( mLayer->actions()->size() > 0 )`
`67`	`68`	`{`