Merge pull request #821 from pkindruk/fix-legend

Fix some legend rendering issues.
beto-rodriguez · Dec 18, 2022 · bd04814 · bd04814
2 parents 5e6b30f + 4f62876
commit bd04814
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/LiveChartsCore/Chart.cs b/src/LiveChartsCore/Chart.cs
@@ -589,6 +589,9 @@ protected void DrawLegend(IChartSeries<TDrawingContext>[] seriesInLegend)
                 if (LegendPosition is LegendPosition.Top or LegendPosition.Bottom)
                     ControlSize = new(ControlSize.Width, ControlSize.Height - imageLegend.Size.Height);
 
+                // reset for cases when legend is hidden or changes postion
+                Canvas.StartPoint = new LvcPoint(0, 0);
+
                 Legend.Draw(this);
 
                 PreviousLegendPosition = LegendPosition;

diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp/SKCharts/SKDefaultLegend.cs b/src/skiasharp/LiveChartsCore.SkiaSharp/SKCharts/SKDefaultLegend.cs
@@ -142,16 +142,19 @@ private void BuildLayout(Chart<SkiaSharpDrawingContext> chart)
         _stackPanel ??= new StackPanel<RoundedRectangleGeometry, SkiaSharpDrawingContext>
         {
             Padding = new Padding(0),
-            Orientation = _orientation,
             HorizontalAlignment = Align.Start,
             VerticalAlignment = Align.Middle,
-            BackgroundPaint = BackgroundPaint
         };
 
+        _stackPanel.Orientation = _orientation;
+        _stackPanel.BackgroundPaint = BackgroundPaint;
+
         _toRemoveSeries = new List<VisualElement<SkiaSharpDrawingContext>>(_stackPanel.Children);
 
         foreach (var series in chart.ChartSeries)
         {
+            if (!series.IsVisibleAtLegend) continue;
+
             var seriesMiniatureVisual = GetSeriesVisual(series);
             _ = _toRemoveSeries.Remove(seriesMiniatureVisual);
         }