Skip to content

Commit d102a79

Browse files
committed
[composer] fix vertical spacing of hidden layer title in legend items (fix #9498)
1 parent 1607759 commit d102a79

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

src/core/composer/qgscomposerlegend.cpp

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ QSizeF QgsComposerLegend::drawLayerItemTitle( QgsComposerLayerItem* layerItem, Q
265265
if ( !layerItem ) return size;
266266

267267
//Let the user omit the layer title item by having an empty layer title string
268-
if ( layerItem->text().isEmpty() ) return size;
268+
if ( layerItem->text().isEmpty() || layerItem->style() == QgsComposerLegendStyle::Hidden ) return size;
269269

270270
double y = point.y();
271271

@@ -805,15 +805,12 @@ QList<QgsComposerLegend::Atom> QgsComposerLegend::createAtomList( QStandardItem*
805805
{
806806
Atom atom;
807807

808-
if ( currentLegendItem->style() != QgsComposerLegendStyle::Hidden )
809-
{
810-
Nucleon nucleon;
811-
nucleon.item = currentLegendItem;
812-
nucleon.size = drawLayerItemTitle( dynamic_cast<QgsComposerLayerItem*>( currentLegendItem ) );
813-
atom.nucleons.append( nucleon );
814-
atom.size.rwidth() = nucleon.size.width();
815-
atom.size.rheight() = nucleon.size.height();
816-
}
808+
Nucleon nucleon;
809+
nucleon.item = currentLegendItem;
810+
nucleon.size = drawLayerItemTitle( dynamic_cast<QgsComposerLayerItem*>( currentLegendItem ) );
811+
atom.nucleons.append( nucleon );
812+
atom.size.rwidth() = nucleon.size.width();
813+
atom.size.rheight() = nucleon.size.height();
817814

818815
QList<Atom> layerAtoms;
819816

0 commit comments

Comments
 (0)