delete ring: consider reprojection when search for clicked ring (fixes #11502)

jef-n · jef-n · commit a00039c80dbd · 2014-10-26T23:03:32.000+01:00
diff --git a/src/app/qgscustomization.cpp b/src/app/qgscustomization.cpp
@@ -400,6 +400,8 @@ bool QgsCustomizationDialog::switchWidget( QWidget *widget, QMouseEvent *e )
     {
       QToolButton* toolbutton = qobject_cast<QToolButton*>( widget );
       QAction* action = toolbutton->defaultAction();
+      if ( !action )
+        return false;
       QString toolbarName = widget->parent()->objectName();
       QString actionName = action->objectName();
       path = "/Toolbars/" + toolbarName + "/" + actionName;
diff --git a/src/app/qgsmaptooldeletering.cpp b/src/app/qgsmaptooldeletering.cpp
@@ -117,7 +117,7 @@ QgsGeometry* QgsMapToolDeleteRing::ringUnderPoint( QgsPoint p, QgsFeatureId& fid
   //so we iterate over all the features visible in the canvas
   //If several rings are found at this position, the smallest one is chosen,
   //in order to be able to delete a ring inside another ring
-  QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest().setFilterRect( mCanvas->extent() ) );
+  QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest().setFilterRect( toLayerCoordinates( vlayer, mCanvas->extent() ) ) );
   QgsFeature f;
   QgsGeometry* g;
   QgsGeometry* ringGeom = 0;

Original file line number	Diff line number	Diff line change
`@@ -400,6 +400,8 @@ bool QgsCustomizationDialog::switchWidget( QWidget widget, QMouseEvent e )`
`400`	`400`	`{`
`401`	`401`	`QToolButton* toolbutton = qobject_cast<QToolButton*>( widget );`
`402`	`402`	`QAction* action = toolbutton->defaultAction();`
	`403`	`+ if ( !action )`
	`404`	`+ return false;`
`403`	`405`	`QString toolbarName = widget->parent()->objectName();`
`404`	`406`	`QString actionName = action->objectName();`
`405`	`407`	`path = "/Toolbars/" + toolbarName + "/" + actionName;`