Skip to content

Commit 7543408

Browse files
committed
Don't add Geometry Generator as Outline option
1 parent bc30075 commit 7543408

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

src/gui/symbology-ng/qgslayerpropertieswidget.cpp

+12-8
Original file line numberDiff line numberDiff line change
@@ -138,19 +138,23 @@ void QgsLayerPropertiesWidget::setExpressionContext( QgsExpressionContext *conte
138138

139139
void QgsLayerPropertiesWidget::populateLayerTypes()
140140
{
141-
QStringList types = QgsSymbolLayerV2Registry::instance()->symbolLayersForType( mSymbol->type() );
141+
QStringList symbolLayerIds = QgsSymbolLayerV2Registry::instance()->symbolLayersForType( mSymbol->type() );
142142

143-
for ( int i = 0; i < types.count(); i++ )
144-
cboLayerType->addItem( QgsSymbolLayerV2Registry::instance()->symbolLayerMetadata( types[i] )->visibleName(), types[i] );
143+
Q_FOREACH ( const QString& symbolLayerId, symbolLayerIds )
144+
cboLayerType->addItem( QgsSymbolLayerV2Registry::instance()->symbolLayerMetadata( symbolLayerId )->visibleName(), symbolLayerId );
145145

146146
if ( mSymbol->type() == QgsSymbolV2::Fill )
147147
{
148-
QStringList typesLine = QgsSymbolLayerV2Registry::instance()->symbolLayersForType( QgsSymbolV2::Line );
149-
for ( int i = 0; i < typesLine.count(); i++ )
148+
QStringList lineLayerIds = QgsSymbolLayerV2Registry::instance()->symbolLayersForType( QgsSymbolV2::Line );
149+
Q_FOREACH ( const QString& lineLayerId, lineLayerIds )
150150
{
151-
QString visibleName = QgsSymbolLayerV2Registry::instance()->symbolLayerMetadata( typesLine[i] )->visibleName();
152-
QString name = QString( tr( "Outline: %1" ) ).arg( visibleName );
153-
cboLayerType->addItem( name, typesLine[i] );
151+
QgsSymbolLayerV2AbstractMetadata* layerInfo = QgsSymbolLayerV2Registry::instance()->symbolLayerMetadata( lineLayerId );
152+
if ( layerInfo->type() != QgsSymbolV2::Hybrid )
153+
{
154+
QString visibleName = layerInfo->visibleName();
155+
QString name = QString( tr( "Outline: %1" ) ).arg( visibleName );
156+
cboLayerType->addItem( name, lineLayerId );
157+
}
154158
}
155159
}
156160
}

0 commit comments

Comments
 (0)