fixed ticket 59 (zoom tool recieving right click)

rblazek · rblazek · commit d805cd984e0f · 2006-08-08T17:06:11.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@5675 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -662,8 +662,6 @@ void QgsMapCanvas::contentsMouseReleaseEvent(QMouseEvent * e)
   // call handler of current map tool
   if (mMapTool)
   {
-    mMapTool->canvasReleaseEvent(e);
-    
     // right button was pressed in zoom tool? return to previous non zoom tool
     if (e->button() == Qt::RightButton && mMapTool->isZoomTool())
     {
@@ -680,6 +678,7 @@ void QgsMapCanvas::contentsMouseReleaseEvent(QMouseEvent * e)
       }
       return;
     }
+    mMapTool->canvasReleaseEvent(e);
   }
 
   

Original file line number	Diff line number	Diff line change
`@@ -662,8 +662,6 @@ void QgsMapCanvas::contentsMouseReleaseEvent(QMouseEvent * e)`
`662`	`662`	`// call handler of current map tool`
`663`	`663`	`if (mMapTool)`
`664`	`664`	`{`
`665`		`- mMapTool->canvasReleaseEvent(e);`
`666`		`-`
`667`	`665`	`// right button was pressed in zoom tool? return to previous non zoom tool`
`668`	`666`	`if (e->button() == Qt::RightButton && mMapTool->isZoomTool())`
`669`	`667`	`{`
`@@ -680,6 +678,7 @@ void QgsMapCanvas::contentsMouseReleaseEvent(QMouseEvent * e)`
`680`	`678`	`}`
`681`	`679`	`return;`
`682`	`680`	`}`
	`681`	`+ mMapTool->canvasReleaseEvent(e);`
`683`	`682`	`}`
`684`	`683`
`685`	`684`