Add QgsRenderContext to QgsLayerTreeModelLegendNode::ItemContext

roya0045 · nyalldawson · commit 004d6bae5f0d · 2019-01-15T13:37:36.000+11:00
diff --git a/python/core/auto_generated/layertree/qgslayertreemodellegendnode.sip.in b/python/core/auto_generated/layertree/qgslayertreemodellegendnode.sip.in
@@ -76,6 +76,7 @@ Default implementation does nothing. *
 
     struct ItemContext
     {
+      QgsRenderContext *context;
       QPainter *painter;
       QPointF point;
       double labelXOffset;
diff --git a/src/core/layertree/qgslayertreemodellegendnode.h b/src/core/layertree/qgslayertreemodellegendnode.h
@@ -86,6 +86,8 @@ class CORE_EXPORT QgsLayerTreeModelLegendNode : public QObject
 
     struct ItemContext
     {
+      //! Render context, if available
+      QgsRenderContext *context = nullptr;
       //! Painter
       QPainter *painter = nullptr;
       //! Top-left corner of the legend item
diff --git a/src/core/qgslegendrenderer.cpp b/src/core/qgslegendrenderer.cpp
@@ -536,6 +536,7 @@ QgsLegendRenderer::Nucleon QgsLegendRenderer::drawSymbolItem( QgsLayerTreeModelL
 QgsLegendRenderer::Nucleon QgsLegendRenderer::drawSymbolItemInternal( QgsLayerTreeModelLegendNode *symbolItem, QgsRenderContext *context, QPainter *painter, QPointF point, double labelXOffset )
 {
   QgsLayerTreeModelLegendNode::ItemContext ctx;
+  ctx.context = context;
   ctx.painter = context ? context->painter() : painter;
   ctx.point = point;
   ctx.labelXOffset = labelXOffset;

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ Default implementation does nothing. *`
`76`	`76`
`77`	`77`	`struct ItemContext`
`78`	`78`	`{`
	`79`	`+ QgsRenderContext *context;`
`79`	`80`	`QPainter *painter;`
`80`	`81`	`QPointF point;`
`81`	`82`	`double labelXOffset;`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,8 @@ class CORE_EXPORT QgsLayerTreeModelLegendNode : public QObject`
`86`	`86`
`87`	`87`	`struct ItemContext`
`88`	`88`	`{`
	`89`	`+ //! Render context, if available`
	`90`	`+ QgsRenderContext *context = nullptr;`
`89`	`91`	`//! Painter`
`90`	`92`	`QPainter *painter = nullptr;`
`91`	`93`	`//! Top-left corner of the legend item`
Original file line number	Diff line number	Diff line change
`@@ -536,6 +536,7 @@ QgsLegendRenderer::Nucleon QgsLegendRenderer::drawSymbolItem( QgsLayerTreeModelL`
`536`	`536`	`QgsLegendRenderer::Nucleon QgsLegendRenderer::drawSymbolItemInternal( QgsLayerTreeModelLegendNode symbolItem, QgsRenderContext context, QPainter *painter, QPointF point, double labelXOffset )`
`537`	`537`	`{`
`538`	`538`	`QgsLayerTreeModelLegendNode::ItemContext ctx;`
	`539`	`+ ctx.context = context;`
`539`	`540`	`ctx.painter = context ? context->painter() : painter;`
`540`	`541`	`ctx.point = point;`
`541`	`542`	`ctx.labelXOffset = labelXOffset;`