Themes review

samples/ViewModelsSamples/Bars/DelayedAnimation/ViewModel.cs

@@ -5,6 +5,8 @@
 using LiveChartsCore.Kernel;
 using LiveChartsCore.SkiaSharpView;
 using LiveChartsCore.SkiaSharpView.Drawing.Geometries;
+using LiveChartsCore.SkiaSharpView.Painting;
+using SkiaSharp;
 
 namespace ViewModelsSamples.Bars.DelayedAnimation;
 
@@ -36,9 +38,10 @@ public ViewModel()
 
     private void OnPointMeasured(ChartPoint<float, RoundedRectangleGeometry, LabelGeometry> point)
     {
-        var perPointDelay = 100; // in milliseconds
+        var baseAnimationsSpeed = 800f; // in milliseconds
+        var perPointDelay = 100f; // in milliseconds
         var delay = point.Context.Entity.MetaData!.EntityIndex * perPointDelay;
-        var speed = (float)point.Context.Chart.AnimationsSpeed.TotalMilliseconds + delay;
+        var speed = baseAnimationsSpeed + delay;
 
         // the animation takes a function, that represents the progress of the animation
         // the parameter is the progress of the animation, it goes from 0 to 1

samples/ViewModelsSamples/Bars/Race/ViewModel.cs

@@ -56,7 +56,7 @@ public ViewModel()
         var rowSeries = new RowSeries<PilotInfo>
         {
             Values = SortData(),
-            DataLabelsPaint = new SolidColorPaint(new SKColor(245, 245, 245)),
+            ShowDataLabels = true,
             DataLabelsPosition = DataLabelsPosition.End,
             DataLabelsTranslate = new(-1, 0),
             DataLabelsFormatter = point => $"{point.Model!.Name} {point.Coordinate.PrimaryValue}",

samples/ViewModelsSamples/Bars/RowsWithLabels/ViewModel.cs

@@ -13,23 +13,23 @@ public class ViewModel
         {
             Values = [8, -3, 4],
             Stroke = null,
-            DataLabelsPaint = new SolidColorPaint(new SKColor(45, 45, 45)),
+            ShowDataLabels = true,
             DataLabelsSize = 14,
             DataLabelsPosition = DataLabelsPosition.End
         },
         new RowSeries<int>
         {
             Values = [4, -6, 5],
             Stroke = null,
-            DataLabelsPaint = new SolidColorPaint(new SKColor(250, 250, 250)),
+            ShowDataLabels = true,
             DataLabelsSize = 14,
             DataLabelsPosition = DataLabelsPosition.Middle
         },
         new RowSeries<int>
         {
             Values = [6, -9, 3],
             Stroke = null,
-            DataLabelsPaint = new SolidColorPaint(new SKColor(45, 45, 45)),
+            ShowDataLabels = true,
             DataLabelsSize = 14,
             DataLabelsPosition = DataLabelsPosition.Start
         }

samples/ViewModelsSamples/Error/Basic/ViewModel.cs

@@ -51,13 +51,13 @@ public ViewModel()
             new ColumnSeries<ErrorValue>
             {
                 Values = values0,
-                ErrorPaint = new SolidColorPaint(SKColors.Black),
+                ShowError = true,
                 Padding = 0
             },
             new ColumnSeries<ErrorPoint>
             {
                 Values = values1,
-                ErrorPaint = new SolidColorPaint(SKColors.Black),
+                ShowError = true,
                 Padding = 0
             }
         ];
@@ -67,7 +67,7 @@ public ViewModel()
             new LineSeries<ErrorValue, RectangleGeometry>
             {
                 Values = values0,
-                ErrorPaint = new SolidColorPaint(SKColors.Black),
+                ShowError = true,
                 GeometrySize = 4,
                 Fill = null
             }
@@ -94,7 +94,7 @@ public ViewModel()
             new ScatterSeries<ErrorDateTimePoint>
             {
                 Values = values2,
-                ErrorPaint = new SolidColorPaint(SKColors.Black),
+                ShowError = true,
                 GeometrySize = 10
             }
         ];

samples/ViewModelsSamples/Events/Cartesian/ViewModel.cs

@@ -30,7 +30,7 @@ public ViewModel()
             Values = data,
             YToolTipLabelFormatter = point => $"{point.Model?.Stock} {point.Model?.Name}",
             DataLabelsFormatter = point => $"{point.Model?.Stock} {point.Model?.Name}",
-            DataLabelsPaint = new SolidColorPaint(new SKColor(30, 30, 30)),
+            ShowDataLabels = true,
             DataLabelsPosition = DataLabelsPosition.End,
             Mapping = (fruit, index) => new(index, fruit.Stock)
         };

samples/ViewModelsSamples/General/MapPoints/ViewModel.cs

@@ -24,7 +24,7 @@ public ViewModel()
         var series = new ColumnSeries<int>
         {
             Values = [2, 5, 4, 6, 8, 3, 2, 4, 6],
-            DataLabelsPaint = new SolidColorPaint(new SKColor(30, 30, 30)),
+            ShowDataLabels = true,
             DataLabelsPosition = DataLabelsPosition.Top
         }
         .OnPointMeasured(point =>

samples/ViewModelsSamples/Pies/Custom/ViewModel.cs

@@ -29,10 +29,7 @@ public ViewModel()
             series.OuterRadiusOffset = outer;
             outer += 50;
 
-            series.DataLabelsPaint = new SolidColorPaint(SKColors.White)
-            {
-                SKTypeface = SKTypeface.FromFamilyName("Arial", SKFontStyle.Bold)
-            };
+            series.ShowDataLabels = true;
 
             series.ToolTipLabelFormatter =
                 point =>

samples/ViewModelsSamples/Pies/Gauge2/ViewModel.cs

@@ -15,7 +15,7 @@ public class ViewModel
             {
                 series.Fill = new SolidColorPaint(SKColors.YellowGreen);
                 series.DataLabelsSize = 50;
-                series.DataLabelsPaint = new SolidColorPaint(SKColors.Red);
+                series.ShowDataLabels = true;
                 series.DataLabelsPosition = PolarLabelsPosition.ChartCenter;
                 series.InnerRadius = 75;
             }),

samples/ViewModelsSamples/Pies/Icons/ViewModel.cs

@@ -28,7 +28,7 @@ public ViewModel()
             (dataItem, series) =>
             {
                 // define the data labels paint.
-                series.DataLabelsPaint = new SolidColorPaint(SKColors.WhiteSmoke);
+                series.ShowDataLabels = true;
 
                 // now, when the point is measured,
                 // we will set up the svg label based on the BrowserShare class.

samples/ViewModelsSamples/Pies/OutLabels/ViewModel.cs

@@ -17,7 +17,7 @@ public class ViewModel
              series.Name = _names[_index++ % _names.Length];
              series.DataLabelsPosition = LiveChartsCore.Measure.PolarLabelsPosition.Outer; // mark
              series.DataLabelsSize = 15;
-             series.DataLabelsPaint = new SolidColorPaint(new SKColor(30, 30, 30));
+             series.ShowDataLabels = true;
              series.DataLabelsFormatter =
                 point =>
                     $"This slide takes {point.Coordinate.PrimaryValue} " +

samples/ViewModelsSamples/Polar/Basic/ViewModel.cs

@@ -13,7 +13,7 @@ public class ViewModel
         new PolarLineSeries<double>
         {
             Values = [15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1],
-            DataLabelsPaint = new SolidColorPaint(new SKColor(30, 30, 30)),
+            ShowDataLabels = true,
             GeometrySize = 15,
             DataLabelsSize = 8,
             DataLabelsPosition = PolarLabelsPosition.Middle,

samples/ViewModelsSamples/Polar/Test/ViewModel.cs

@@ -22,7 +22,7 @@ public class ViewModel : INotifyPropertyChanged
         new PolarLineSeries<double>
         {
             Values = new ObservableCollection<double> { 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 },
-            DataLabelsPaint = new SolidColorPaint(new SKColor(30, 30, 30)),
+            ShowDataLabels = true,
             GeometrySize = 30,
             DataLabelsSize = 15,
             DataLabelsPosition = PolarLabelsPosition.Middle,

samples/ViewModelsSamples/StackedBars/Basic/ViewModel.cs

@@ -14,7 +14,7 @@ public class ViewModel
         {
             Values = [3, 5, -3, 2, 5, -4, -2],
             Stroke = null,
-            DataLabelsPaint = new SolidColorPaint(new SKColor(45, 45, 45)),
+            ShowDataLabels = true,
             DataLabelsSize = 14,
             DataLabelsPosition = DataLabelsPosition.Middle,
             YToolTipLabelFormatter =
@@ -24,7 +24,7 @@ public class ViewModel
         {
             Values = [4, 2, -3, 2, 3, 4, -2],
             Stroke = null,
-            DataLabelsPaint = new SolidColorPaint(new SKColor(45, 45, 45)),
+            ShowDataLabels = true,
             DataLabelsSize = 14,
             DataLabelsPosition = DataLabelsPosition.Middle,
             YToolTipLabelFormatter =
@@ -34,7 +34,7 @@ public class ViewModel
         {
             Values = [-2, 6, 6, 5, 4, 3, -2],
             Stroke = null,
-            DataLabelsPaint = new SolidColorPaint(new SKColor(45, 45, 45)),
+            ShowDataLabels = true,
             DataLabelsSize = 14,
             DataLabelsPosition = DataLabelsPosition.Middle,
             YToolTipLabelFormatter =

samples/WinUISample/WinUISample/WinUISample.csproj

@@ -8,7 +8,7 @@
     <Platforms>x86;x64;ARM64</Platforms>
     <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) &gt;= 8">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
     <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) &lt; 8">win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-    <PublishProfile>win10-$(Platform).pubxml</PublishProfile>
+    <PublishProfile>win-$(Platform).pubxml</PublishProfile>
     <UseWinUI>true</UseWinUI>
     <EnableMsixTooling>true</EnableMsixTooling>
   </PropertyGroup>

src/LiveChartsCore/BarSeries.cs

@@ -59,6 +59,7 @@ public abstract class BarSeries<TModel, TVisual, TLabel>(
     private double _rx;
     private double _ry;
     private Paint? _errorPaint;
+    private bool _showError;
 
     /// <inheritdoc cref="IBarSeries.Padding"/>
     public double Padding { get => _pading; set => SetProperty(ref _pading, value); }
@@ -75,11 +76,27 @@ public abstract class BarSeries<TModel, TVisual, TLabel>(
     /// <inheritdoc cref="IBarSeries.Ry"/>
     public double Ry { get => _ry; set => SetProperty(ref _ry, value); }
 
+    /// <inheritdoc cref="IErrorSeries.ShowError"/>
+    public bool ShowError
+    {
+        get => _showError;
+        set
+        {
+            SetProperty(ref _showError, value);
+            if (_errorPaint is not null)
+                _errorPaint.IsPaused = !value;
+        }
+    }
+
     /// <inheritdoc cref="IErrorSeries.ErrorPaint"/>
     public Paint? ErrorPaint
     {
         get => _errorPaint;
-        set => SetPaintProperty(ref _errorPaint, value, PaintStyle.Stroke);
+        set
+        {
+            SetPaintProperty(ref _errorPaint, value, PaintStyle.Stroke);
+            _showError = value is not null;
+        }
     }
 
     /// <inheritdoc cref="Series{TModel, TVisual, TLabel}.GetMiniaturesSketch"/>

src/LiveChartsCore/CartesianChartEngine.cs

@@ -367,8 +367,6 @@ protected internal override void Measure()
             _preserveFirstDraw = false;
         }
 
-        MeasureWork = new object();
-
         #region shallow copy the current data in the view
 
         var viewDrawMargin = _chartView.DrawMargin;
@@ -386,8 +384,8 @@ protected internal override void Measure()
             y = [provider.GetDefaultCartesianAxis()];
         }
 
-        XAxes = x.Cast<ICartesianAxis>().ToArray();
-        YAxes = y.Cast<ICartesianAxis>().ToArray();
+        XAxes = [.. x.Cast<ICartesianAxis>()];
+        YAxes = [.. y.Cast<ICartesianAxis>()];
 
         if (XAxes.Length == 0 || YAxes.Length == 0)
         {
@@ -397,7 +395,7 @@ protected internal override void Measure()
         _zoomingSpeed = _chartView.ZoomingSpeed;
         _zoomMode = _chartView.ZoomMode;
 
-        var theme = LiveCharts.DefaultSettings.GetTheme();
+        var theme = GetTheme();
 
         LegendPosition = _chartView.LegendPosition;
         Legend = _chartView.Legend;
@@ -406,16 +404,20 @@ protected internal override void Measure()
         FindingStrategy = _chartView.FindingStrategy;
         Tooltip = _chartView.Tooltip;
 
-        AnimationsSpeed = _chartView.AnimationsSpeed;
-        EasingFunction = _chartView.EasingFunction;
-
         Sections = _chartView.Sections?.Where(static x => x.IsVisible) ?? [];
         VisualElements = _chartView.VisualElements ?? [];
 
+        ActualAnimationsSpeed = _chartView.AnimationsSpeed == TimeSpan.MaxValue
+            ? theme.AnimationsSpeed
+            : _chartView.AnimationsSpeed;
+        ActualEasingFunction = _chartView.EasingFunction == EasingFunctions.Unset
+            ? theme.EasingFunction
+            : _chartView.EasingFunction;
+
         #endregion
 
         SeriesContext = new SeriesContext(VisibleSeries, this);
-        var themeId = LiveCharts.DefaultSettings.CurrentThemeId;
+        var themeId = theme.ThemeId;
 
         // restart axes bounds and meta data
         foreach (var axis in XAxes)

src/LiveChartsCore/Chart.cs

@@ -30,6 +30,7 @@
 using LiveChartsCore.Kernel.Sketches;
 using LiveChartsCore.Measure;
 using LiveChartsCore.Motion;
+using LiveChartsCore.Themes;
 using LiveChartsCore.VisualElements;
 
 namespace LiveChartsCore;
@@ -83,7 +84,7 @@ protected Chart(
         Kind = kind;
         Canvas = canvas;
         canvas.Validated += OnCanvasValidated;
-        EasingFunction = EasingFunctions.QuadraticOut;
+        ActualEasingFunction = EasingFunctions.QuadraticOut;
         LiveCharts.Configure(defaultPlatformConfig);
 
         _updateThrottler = view.DesignerMode
@@ -122,14 +123,6 @@ protected Chart(
     /// </summary>
     public AnimatableContainer ActualBounds { get; } = new();
 
-    /// <summary>
-    /// Gets the measure work.
-    /// </summary>
-    /// <value>
-    /// The measure work.
-    /// </value>
-    public object MeasureWork { get; protected set; } = new();
-
     /// <summary>
     /// Gets the kind of the chart.
     /// </summary>
@@ -247,15 +240,15 @@ protected Chart(
     /// <value>
     /// The animations speed.
     /// </value>
-    public TimeSpan AnimationsSpeed { get; protected set; }
+    public TimeSpan ActualAnimationsSpeed { get; protected set; }
 
     /// <summary>
     /// Gets the easing function.
     /// </summary>
     /// <value>
     /// The easing function.
     /// </value>
-    public Func<float, float>? EasingFunction { get; protected set; }
+    public Func<float, float>? ActualEasingFunction { get; protected set; }
 
     /// <summary>
     /// Gets the visual elements.
@@ -309,8 +302,8 @@ public virtual void Load()
     {
         IsLoaded = true;
         _isFirstDraw = true;
-        View.Tooltip ??= LiveCharts.DefaultSettings.GetTheme().DefaultTooltip();
-        View.Legend ??= LiveCharts.DefaultSettings.GetTheme().DefaultLegend();
+        View.Tooltip ??= GetTheme().DefaultTooltip();
+        View.Legend ??= GetTheme().DefaultLegend();
         Update();
     }
 
@@ -521,7 +514,7 @@ protected void UpdateBounds()
 
         if (_isFirstDraw)
         {
-            ActualBounds.Animate(EasingFunction, AnimationsSpeed);
+            ActualBounds.Animate(ActualEasingFunction, ActualAnimationsSpeed);
             _ = Canvas.Trackers.Add(ActualBounds);
         }
     }
@@ -593,6 +586,24 @@ public LvcPoint GetLegendPosition()
     /// <returns>A boolean indicating whether the series is drawn.</returns>
     public bool IsDrawn(int seriesId) => _drawnSeries.Contains(seriesId);
 
+    /// <summary>
+    /// Gets the active theme.
+    /// </summary>
+    /// <returns></returns>
+    public Theme GetTheme()
+    {
+        var theme = LiveCharts.DefaultSettings.GetTheme();
+        theme.Setup(View);
+        return theme;
+    }
+
+    /// <summary>
+    /// Applies the current theme to the chart.
+    /// </summary>
+    public virtual void ApplyTheme() =>
+        // this is not optimal, we should only update the colors instead of re-measuring everything.
+        Measure();
+
     /// <summary>
     /// Collects and deletes from the UI the unused visuals.
     /// </summary>