Make measure dialog only stay on top of QGIS window (fix #12261)

nyalldawson · nyalldawson · commit eb5b428ef020 · 2016-07-01T18:44:23.000+10:00
(cherry-picked from 340a6f6)
diff --git a/src/app/qgsmaptoolmeasureangle.cpp b/src/app/qgsmaptoolmeasureangle.cpp
@@ -93,7 +93,8 @@ void QgsMapToolMeasureAngle::canvasReleaseEvent( QgsMapMouseEvent* e )
   {
     if ( !mResultDisplay )
     {
-      mResultDisplay = new QgsDisplayAngle( this, Qt::WindowStaysOnTopHint );
+      mResultDisplay = new QgsDisplayAngle( this );
+      mResultDisplay->setWindowFlags( mResultDisplay->windowFlags() | Qt::Tool );
       QObject::connect( mResultDisplay, SIGNAL( rejected() ), this, SLOT( stopMeasuring() ) );
     }
     configureDistanceArea();
diff --git a/src/app/qgsmeasuretool.cpp b/src/app/qgsmeasuretool.cpp
@@ -47,7 +47,8 @@ QgsMeasureTool::QgsMeasureTool( QgsMapCanvas* canvas, bool measureArea )
   // Append point we will move
   mPoints.append( QgsPoint( 0, 0 ) );
 
-  mDialog = new QgsMeasureDialog( this, Qt::WindowStaysOnTopHint );
+  mDialog = new QgsMeasureDialog( this );
+  mDialog->setWindowFlags( mDialog->windowFlags() | Qt::Tool );
   mDialog->restorePosition();
 
   connect( canvas, SIGNAL( destinationCrsChanged() ),

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,8 @@ void QgsMapToolMeasureAngle::canvasReleaseEvent( QgsMapMouseEvent* e )`
`93`	`93`	`{`
`94`	`94`	`if ( !mResultDisplay )`
`95`	`95`	`{`
`96`		`- mResultDisplay = new QgsDisplayAngle( this, Qt::WindowStaysOnTopHint );`
	`96`	`+ mResultDisplay = new QgsDisplayAngle( this );`
	`97`	`+ mResultDisplay->setWindowFlags( mResultDisplay->windowFlags() \| Qt::Tool );`
`97`	`98`	`QObject::connect( mResultDisplay, SIGNAL( rejected() ), this, SLOT( stopMeasuring() ) );`
`98`	`99`	`}`
`99`	`100`	`configureDistanceArea();`