Updates to legend active layer

dakcarto · dakcarto · commit d85ed328ab01 · 2012-12-31T13:12:12.000-07:00
- Single click in blank, non-item space in legend unsets active layer (same behavior as clicking group)
- Underline active layer (helpful when active layer, and no selection or multiple selected layers)
diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
@@ -183,6 +183,15 @@ void QgsLegend::handleCurrentItemChanged( QTreeWidgetItem* current, QTreeWidgetI
     mMapCanvas->setCurrentLayer( layer );
   }
 
+  blockSignals( true ); // or itemChanged() emitted
+  foreach ( QgsLegendLayer *ll, legendLayers() )
+  {
+    QFont itemFont = ll->font( 0 );
+    itemFont.setUnderline( ll->layer() == layer );
+    ll->setFont( 0, itemFont );
+  }
+  blockSignals( false );
+
   emit currentLayerChanged( layer );
 }
 
@@ -385,6 +394,10 @@ void QgsLegend::mousePressEvent( QMouseEvent * e )
   {
     mMousePressedFlag = true;
     mDropTarget = itemAt( e->pos() );
+    if ( !mDropTarget )
+    {
+      setCurrentItem( 0 );
+    }
   }
   else if ( e->button() == Qt::RightButton )
   {
diff --git a/src/app/legend/qgslegend.h b/src/app/legend/qgslegend.h
@@ -465,7 +465,7 @@ class QgsLegend : public QTreeWidget
     void collapseAll();
     /** toogle update drawing order */
     void toggleDrawingOrderUpdate();
-    void handleItemChange( QTreeWidgetItem* item, int row );
+    void handleItemChange( QTreeWidgetItem* item, int column );
     void handleCloseEditor( QWidget * editor, QAbstractItemDelegate::EndEditHint hint );
     /** delegates current layer to map canvas */
     void handleCurrentItemChanged( QTreeWidgetItem* current, QTreeWidgetItem* previous );

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,15 @@ void QgsLegend::handleCurrentItemChanged( QTreeWidgetItem* current, QTreeWidgetI`
`183`	`183`	`mMapCanvas->setCurrentLayer( layer );`
`184`	`184`	`}`
`185`	`185`
	`186`	`+ blockSignals( true ); // or itemChanged() emitted`
	`187`	`+ foreach ( QgsLegendLayer *ll, legendLayers() )`
	`188`	`+ {`
	`189`	`+ QFont itemFont = ll->font( 0 );`
	`190`	`+ itemFont.setUnderline( ll->layer() == layer );`
	`191`	`+ ll->setFont( 0, itemFont );`
	`192`	`+ }`
	`193`	`+ blockSignals( false );`
	`194`	`+`
`186`	`195`	`emit currentLayerChanged( layer );`
`187`	`196`	`}`
`188`	`197`
`@@ -385,6 +394,10 @@ void QgsLegend::mousePressEvent( QMouseEvent * e )`
`385`	`394`	`{`
`386`	`395`	`mMousePressedFlag = true;`
`387`	`396`	`mDropTarget = itemAt( e->pos() );`
	`397`	`+ if ( !mDropTarget )`
	`398`	`+ {`
	`399`	`+ setCurrentItem( 0 );`
	`400`	`+ }`
`388`	`401`	`}`
`389`	`402`	`else if ( e->button() == Qt::RightButton )`
`390`	`403`	`{`