From a7de7edcbeec4de34363024f4b9f2adfcc52a746 Mon Sep 17 00:00:00 2001 From: nirvn Date: Tue, 2 Jun 2020 15:15:13 +0700 Subject: [PATCH] Remove 'fake' tree view code from layer tree model symbol icon creation --- .../layertree/qgslayertreemodellegendnode.cpp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/core/layertree/qgslayertreemodellegendnode.cpp b/src/core/layertree/qgslayertreemodellegendnode.cpp index 19e463962b4..e973673b4c2 100644 --- a/src/core/layertree/qgslayertreemodellegendnode.cpp +++ b/src/core/layertree/qgslayertreemodellegendnode.cpp @@ -294,9 +294,6 @@ QSize QgsSymbolLegendNode::minimumIconSize( QgsRenderContext *context ) const if ( hInt > minSz.height() ) minSz.setHeight( hInt ); } - if ( mItem.level() != 0 && !( model() && model()->testFlag( QgsLayerTreeModel::ShowLegendAsTree ) ) ) - minSz.setWidth( mItem.level() * INDENT_SIZE + minSz.width() ); - return minSz; } @@ -463,18 +460,7 @@ QVariant QgsSymbolLegendNode::data( int role ) const pix.fill( Qt::transparent ); } - if ( mItem.level() == 0 || ( model() && model()->testFlag( QgsLayerTreeModel::ShowLegendAsTree ) ) ) - mPixmap = pix; - else - { - // ident the symbol icon to make it look like a tree structure - QPixmap pix2( pix.width() + mItem.level() * INDENT_SIZE, pix.height() ); - pix2.fill( Qt::transparent ); - QPainter p( &pix2 ); - p.drawPixmap( mItem.level() * INDENT_SIZE, 0, pix ); - p.end(); - mPixmap = pix2; - } + mPixmap = pix; } return mPixmap; }