Restore some more atlas style related UI

nyalldawson · nyalldawson · commit 8072d4d35761 · 2018-01-05T11:15:03.000+10:00
diff --git a/src/app/layout/qgslayoutmapgridwidget.cpp b/src/app/layout/qgslayoutmapgridwidget.cpp
@@ -149,6 +149,17 @@ QgsLayoutMapGridWidget::QgsLayoutMapGridWidget( QgsLayoutItemMapGrid *mapGrid, Q
   connect( mAnnotationFontButton, &QgsFontButton::changed, this, &QgsLayoutMapGridWidget::annotationFontChanged );
   connect( mGridLineStyleButton, &QgsSymbolButton::changed, this, &QgsLayoutMapGridWidget::lineSymbolChanged );
   connect( mGridMarkerStyleButton, &QgsSymbolButton::changed, this, &QgsLayoutMapGridWidget::markerSymbolChanged );
+
+  mGridLineStyleButton->registerExpressionContextGenerator( mMapGrid );
+  mGridLineStyleButton->setLayer( coverageLayer() );
+  mGridMarkerStyleButton->registerExpressionContextGenerator( mMapGrid );
+  mGridMarkerStyleButton->setLayer( coverageLayer() );
+  if ( mMap->layout() )
+  {
+    connect( &mMap->layout()->context(), &QgsLayoutContext::layerChanged, mGridLineStyleButton, &QgsSymbolButton::setLayer );
+    connect( &mMap->layout()->context(), &QgsLayoutContext::layerChanged, mGridMarkerStyleButton, &QgsSymbolButton::setLayer );
+  }
+
 }
 
 void QgsLayoutMapGridWidget::populateDataDefinedButtons()
diff --git a/src/app/layout/qgslayoutmapwidget.cpp b/src/app/layout/qgslayoutmapwidget.cpp
@@ -130,6 +130,14 @@ QgsLayoutMapWidget::QgsLayoutMapWidget( QgsLayoutItemMap *item )
   connect( mCrsSelector, &QgsProjectionSelectionWidget::crsChanged, this, &QgsLayoutMapWidget::mapCrsChanged );
   connect( mOverviewFrameStyleButton, &QgsSymbolButton::changed, this, &QgsLayoutMapWidget::overviewSymbolChanged );
 
+  mOverviewFrameStyleButton->registerExpressionContextGenerator( item );
+  mOverviewFrameStyleButton->setLayer( coverageLayer() );
+  if ( item->layout() )
+  {
+    connect( &item->layout()->context(), &QgsLayoutContext::layerChanged, mOverviewFrameStyleButton, &QgsSymbolButton::setLayer );
+  }
+
+
   registerDataDefinedButton( mScaleDDBtn, QgsLayoutObject::MapScale );
   registerDataDefinedButton( mMapRotationDDBtn, QgsLayoutObject::MapRotation );
   registerDataDefinedButton( mXMinDDBtn, QgsLayoutObject::MapXMin );
