Skip to content

Commit df0d690

Browse files
committed
Fix #7012
1 parent 9c4c215 commit df0d690

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/core/composer/qgscomposerlegend.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -326,11 +326,6 @@ QgsComposerLegend::Nucleon QgsComposerLegend::drawSymbolItem( QgsComposerLegendI
326326
#endif
327327

328328
QString text = symbolItem->text();
329-
if ( text.isEmpty() )
330-
{
331-
// Use layer label, used for single symbols
332-
text = layerItem->text();
333-
}
334329

335330
QStringList lines = splitStringForWrapping( text );
336331

src/core/composer/qgslegendmodel.cpp

+6
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ int QgsLegendModel::addVectorLayerItemsV2( QStandardItem* layerItem, QgsVectorLa
170170
if ( oldSymbolItem )
171171
{
172172
currentSymbolItem->setUserText( oldSymbolItem->userText() );
173+
173174
}
174175

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

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

276+
if ( renderer->type() == "singleSymbol" )
277+
{
278+
label = vLayer->name();
279+
}
280+
275281
if ( lItem->showFeatureCount() )
276282
{
277283
// Add counts to multi symbols layers only or labeled single symbols,

0 commit comments

Comments
 (0)