sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-06 00:07:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Simplify logic

Browse Source
This commit is contained in:
Nyall Dawson 2023-06-22 15:36:22 +10:00
parent 3cfb71b3e9
commit b86bb1e2ef
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/layertree/qgslayertreemodellegendnode.cpp
View File

@ -548,7 +548,6 @@ QVariant QgsSymbolLegendNode::data( int role ) const
{
if ( mPixmap.isNull() )
{
QPixmap pix;
if ( mItem.symbol() )
{
std::unique_ptr<QgsRenderContext> context( createTemporaryRenderContext() );
@ -557,11 +556,11 @@ QVariant QgsSymbolLegendNode::data( int role ) const
double width = 0.0;
double height = 0.0;
const std::unique_ptr<QgsSymbol> symbol( QgsSymbolLayerUtils::restrictedSizeSymbol( mItem.symbol(), MINIMUM_SIZE, MAXIMUM_SIZE, context.get(), width, height ) );
pix = QgsSymbolLayerUtils::symbolPreviewPixmap( symbol ? symbol.get() : mItem.symbol(), mIconSize, 0, context.get() );
mPixmap = QgsSymbolLayerUtils::symbolPreviewPixmap( symbol ? symbol.get() : mItem.symbol(), mIconSize, 0, context.get() );
if ( !mTextOnSymbolLabel.isEmpty() && context )
{
QPainter painter( &pix );
QPainter painter( &mPixmap );
painter.setRenderHint( QPainter::Antialiasing );
context->setPainter( &painter );
bool isNullSize = false;
@ -576,11 +575,9 @@ QVariant QgsSymbolLegendNode::data( int role ) const
}
else
{
pix = QPixmap( mIconSize );
pix.fill( Qt::transparent );
mPixmap = QPixmap( mIconSize );
mPixmap.fill( Qt::transparent );
}
mPixmap = pix;
}
return mPixmap;
}