display menu at the correct position

signedav · signedav · commit 723df76fba1e · 2018-10-18T14:54:53.000+02:00
diff --git a/src/app/qgsmaptoolfeatureaction.cpp b/src/app/qgsmaptoolfeatureaction.cpp
@@ -75,7 +75,7 @@ void QgsMapToolFeatureAction::canvasReleaseEvent( QgsMapMouseEvent *e )
     return;
   }
 
-  if ( !doAction( vlayer, e->x(), e->y(), e->originalPixelPoint() ) )
+  if ( !doAction( vlayer, e->x(), e->y() ) )
     QgisApp::instance()->statusBarIface()->showMessage( tr( "No features at this position found." ) );
 }
 
@@ -89,12 +89,13 @@ void QgsMapToolFeatureAction::deactivate()
   QgsMapTool::deactivate();
 }
 
-bool QgsMapToolFeatureAction::doAction( QgsVectorLayer *layer, int x, int y, QPoint pixelpos )
+bool QgsMapToolFeatureAction::doAction( QgsVectorLayer *layer, int x, int y )
 {
   if ( !layer )
     return false;
 
   QgsPointXY point = mCanvas->getCoordinateTransform()->toMapCoordinates( x, y );
+  QPoint position = mCanvas->mapToGlobal( QPoint( x + 5, y + 5 ) );
 
   QgsRectangle r;
 
@@ -151,7 +152,7 @@ bool QgsMapToolFeatureAction::doAction( QgsVectorLayer *layer, int x, int y, QPo
         }
       } );
 
-      featureMenu->exec( pixelpos );
+      featureMenu->exec( position );
     }
     return true;
   }
diff --git a/src/app/qgsmaptoolfeatureaction.h b/src/app/qgsmaptoolfeatureaction.h
@@ -52,7 +52,7 @@ class APP_EXPORT QgsMapToolFeatureAction : public QgsMapTool
     void deactivate() override;
 
   private:
-    bool doAction( QgsVectorLayer *layer, int x, int y, QPoint pixelpos );
+    bool doAction( QgsVectorLayer *layer, int x, int y );
     void doActionForFeature( QgsVectorLayer *layer, QgsFeature feat, QgsPointXY point );
 };
 

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ void QgsMapToolFeatureAction::canvasReleaseEvent( QgsMapMouseEvent *e )`
`75`	`75`	`return;`
`76`	`76`	`}`
`77`	`77`
`78`		`- if ( !doAction( vlayer, e->x(), e->y(), e->originalPixelPoint() ) )`
	`78`	`+ if ( !doAction( vlayer, e->x(), e->y() ) )`
`79`	`79`	`QgisApp::instance()->statusBarIface()->showMessage( tr( "No features at this position found." ) );`
`80`	`80`	`}`
`81`	`81`
`@@ -89,12 +89,13 @@ void QgsMapToolFeatureAction::deactivate()`
`89`	`89`	`QgsMapTool::deactivate();`
`90`	`90`	`}`
`91`	`91`
`92`		`-bool QgsMapToolFeatureAction::doAction( QgsVectorLayer *layer, int x, int y, QPoint pixelpos )`
	`92`	`+bool QgsMapToolFeatureAction::doAction( QgsVectorLayer *layer, int x, int y )`
`93`	`93`	`{`
`94`	`94`	`if ( !layer )`
`95`	`95`	`return false;`
`96`	`96`
`97`	`97`	`QgsPointXY point = mCanvas->getCoordinateTransform()->toMapCoordinates( x, y );`
	`98`	`+ QPoint position = mCanvas->mapToGlobal( QPoint( x + 5, y + 5 ) );`
`98`	`99`
`99`	`100`	`QgsRectangle r;`
`100`	`101`
`@@ -151,7 +152,7 @@ bool QgsMapToolFeatureAction::doAction( QgsVectorLayer *layer, int x, int y, QPo`
`151`	`152`	`}`
`152`	`153`	`} );`
`153`	`154`
`154`		`- featureMenu->exec( pixelpos );`
	`155`	`+ featureMenu->exec( position );`
`155`	`156`	`}`
`156`	`157`	`return true;`
`157`	`158`	`}`