keep layer selection on legend right click

jef · jef · commit 6428982b27de · 2010-09-10T14:41:32.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@14217 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
@@ -218,8 +218,8 @@ void QgsLegend::mousePressEvent( QMouseEvent * e )
   else if ( e->button() == Qt::RightButton )
   {
     QTreeWidgetItem* item = itemAt( e->pos() );
-    setCurrentItem( item );
-    handleRightClickEvent( item, e->globalPos() );
+    if ( item == currentItem() )
+      handleRightClickEvent( item, e->globalPos() );
   }
   QTreeWidget::mousePressEvent( e );
 }                               // contentsMousePressEvent
@@ -622,6 +622,7 @@ bool QgsLegend::setCurrentLayer( QgsMapLayer *layer )
     return false;
 
   setCurrentItem( ll );
+  clearSelection();
   return true;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -218,8 +218,8 @@ void QgsLegend::mousePressEvent( QMouseEvent * e )`
`218`	`218`	`else if ( e->button() == Qt::RightButton )`
`219`	`219`	`{`
`220`	`220`	`QTreeWidgetItem* item = itemAt( e->pos() );`
`221`		`- setCurrentItem( item );`
`222`		`- handleRightClickEvent( item, e->globalPos() );`
	`221`	`+ if ( item == currentItem() )`
	`222`	`+ handleRightClickEvent( item, e->globalPos() );`
`223`	`223`	`}`
`224`	`224`	`QTreeWidget::mousePressEvent( e );`
`225`	`225`	`} // contentsMousePressEvent`
`@@ -622,6 +622,7 @@ bool QgsLegend::setCurrentLayer( QgsMapLayer *layer )`
`622`	`622`	`return false;`
`623`	`623`
`624`	`624`	`setCurrentItem( ll );`
	`625`	`+ clearSelection();`
`625`	`626`	`return true;`
`626`	`627`	`}`
`627`	`628`