Skip to content
Permalink
Browse files

Fix #7012

  • Loading branch information
NathanW2 committed Aug 12, 2013
1 parent 9c4c215 commit df0d690cd08e835cd49e7c6e9ef168cc157e38b8
Showing with 6 additions and 5 deletions.
  1. +0 −5 src/core/composer/qgscomposerlegend.cpp
  2. +6 −0 src/core/composer/qgslegendmodel.cpp
@@ -326,11 +326,6 @@ QgsComposerLegend::Nucleon QgsComposerLegend::drawSymbolItem( QgsComposerLegendI
#endif

QString text = symbolItem->text();
if ( text.isEmpty() )
{
// Use layer label, used for single symbols
text = layerItem->text();
}

QStringList lines = splitStringForWrapping( text );

@@ -170,6 +170,7 @@ int QgsLegendModel::addVectorLayerItemsV2( QStandardItem* layerItem, QgsVectorLa
if ( oldSymbolItem )
{
currentSymbolItem->setUserText( oldSymbolItem->userText() );

}

currentSymbolItem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
@@ -272,6 +273,11 @@ void QgsLegendModel::updateSymbolV2ItemText( QStandardItem* symbolItem )

QString label = sv2Item->userText().isEmpty() ? symbol.first : sv2Item->userText();

if ( renderer->type() == "singleSymbol" )
{
label = vLayer->name();
}

if ( lItem->showFeatureCount() )
{
// Add counts to multi symbols layers only or labeled single symbols,

1 comment on commit df0d690

@NathanW2

This comment has been minimized.

Copy link
Member Author

@NathanW2 NathanW2 commented on df0d690 Aug 12, 2013

This closed #8446. Mistake in commit name.

Please sign in to comment.
You can’t perform that action at this time.