Merge pull request #9006 from alexbruy/fix-embedded-layers

alexbruy · web-flow · commit e97649ae1f3e · 2019-01-28T20:41:40.000+02:00
don't allow to change style of the embedded layers from the Layer Styling panel (fix #16339)
diff --git a/src/app/qgslayerstylingwidget.cpp b/src/app/qgslayerstylingwidget.cpp
@@ -137,7 +137,7 @@ void QgsLayerStylingWidget::setLayer( QgsMapLayer *layer )
     disconnect( mCurrentLayer, &QgsMapLayer::styleChanged, this, &QgsLayerStylingWidget::updateCurrentWidgetLayer );
   }
 
-  if ( !layer || !layer->isSpatial() )
+  if ( !layer || !layer->isSpatial() || !QgsProject::instance()->layerIsEmbedded( layer->id() ).isEmpty() )
   {
     mLayerCombo->setLayer( nullptr );
     mStackedWidget->setCurrentIndex( mNotSupportedPage );

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ void QgsLayerStylingWidget::setLayer( QgsMapLayer *layer )`
`137`	`137`	`disconnect( mCurrentLayer, &QgsMapLayer::styleChanged, this, &QgsLayerStylingWidget::updateCurrentWidgetLayer );`
`138`	`138`	`}`
`139`	`139`
`140`		`- if ( !layer \|\| !layer->isSpatial() )`
	`140`	`+ if ( !layer \|\| !layer->isSpatial() \|\| !QgsProject::instance()->layerIsEmbedded( layer->id() ).isEmpty() )`
`141`	`141`	`{`
`142`	`142`	`mLayerCombo->setLayer( nullptr );`
`143`	`143`	`mStackedWidget->setCurrentIndex( mNotSupportedPage );`