Fixed broken support for using Ctrl in select tool to add features to selection.

wonder · wonder · commit 2d50f13e9bbe · 2006-12-10T12:48:18.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@6227 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgsmaptoolselect.cpp b/src/gui/qgsmaptoolselect.cpp
@@ -41,7 +41,7 @@ void QgsMapToolSelect::canvasPressEvent(QMouseEvent * e)
 
 void QgsMapToolSelect::canvasMoveEvent(QMouseEvent * e)
 {
-  if (e->state() != Qt::LeftButton && e->state() != Qt::LeftButton + Qt::ControlModifier)
+  if ( e->buttons() != Qt::LeftButton )
     return;
   
   if (!mDragging)
@@ -86,7 +86,7 @@ void QgsMapToolSelect::canvasReleaseEvent(QMouseEvent * e)
 
   // if Ctrl key is pressed, selected features will be added to selection
   // instead of removing old selection
-  bool lock = (e->state() == Qt::ControlModifier);
+  bool lock = (e->modifiers() & Qt::ControlModifier);
   mCanvas->currentLayer()->select(&search, lock);
 
 }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ void QgsMapToolSelect::canvasPressEvent(QMouseEvent * e)`
`41`	`41`
`42`	`42`	`void QgsMapToolSelect::canvasMoveEvent(QMouseEvent * e)`
`43`	`43`	`{`
`44`		`- if (e->state() != Qt::LeftButton && e->state() != Qt::LeftButton + Qt::ControlModifier)`
	`44`	`+ if ( e->buttons() != Qt::LeftButton )`
`45`	`45`	`return;`
`46`	`46`
`47`	`47`	`if (!mDragging)`
`@@ -86,7 +86,7 @@ void QgsMapToolSelect::canvasReleaseEvent(QMouseEvent * e)`
`86`	`86`
`87`	`87`	`// if Ctrl key is pressed, selected features will be added to selection`
`88`	`88`	`// instead of removing old selection`
`89`		`- bool lock = (e->state() == Qt::ControlModifier);`
	`89`	`+ bool lock = (e->modifiers() & Qt::ControlModifier);`
`90`	`90`	`mCanvas->currentLayer()->select(&search, lock);`
`91`	`91`
`92`	`92`	`}`