From 203e84a4218827327204633913eec451eb0ac6a7 Mon Sep 17 00:00:00 2001 From: izakusilov Date: Sun, 25 Oct 2026 15:42:04 +0000 Subject: [PATCH 01/51] Update Avalonia to 12.1.4 --- Source/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props index 1f55fde..69caaa0 100644 --- a/Source/Directory.Build.props +++ b/Source/Directory.Build.props @@ -1,6 +1,6 @@ - 12.0.2 + 12.1.4 2.2.0 \ No newline at end of file From a5b6a4912debb6c41c2954812fa46a510ab47a7e Mon Sep 17 00:00:00 2001 From: izakusilov Date: Sat, 24 Oct 2026 13:47:17 +0000 Subject: [PATCH 02/51] Remove unused fields from PlotBase --- Source/OxyPlot.Avalonia/PlotBase.cs | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Source/OxyPlot.Avalonia/PlotBase.cs b/Source/OxyPlot.Avalonia/PlotBase.cs index f9f348e..6bf434f 100644 --- a/Source/OxyPlot.Avalonia/PlotBase.cs +++ b/Source/OxyPlot.Avalonia/PlotBase.cs @@ -84,16 +84,6 @@ public abstract partial class PlotBase : TemplatedControl, IPlotView /// private ContentControl zoomControl; - /// - /// The is visible to user cache. - /// - private bool isVisibleToUserCache; - - /// - /// The cached parent. - /// - private Control containerCache; - /// /// Initializes a new instance of the class. /// From 9c754f18fafe274965d16bcde039187fc3833b7a Mon Sep 17 00:00:00 2001 From: izakusilov Date: Sat, 24 Oct 2026 13:47:52 +0000 Subject: [PATCH 03/51] Fix TrackerControl corner radius and border updates --- Source/OxyPlot.Avalonia/Tracker/TrackerControl.cs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Source/OxyPlot.Avalonia/Tracker/TrackerControl.cs b/Source/OxyPlot.Avalonia/Tracker/TrackerControl.cs index 35875a5..8d1b74f 100644 --- a/Source/OxyPlot.Avalonia/Tracker/TrackerControl.cs +++ b/Source/OxyPlot.Avalonia/Tracker/TrackerControl.cs @@ -19,6 +19,7 @@ namespace OxyPlot.Avalonia using global::Avalonia.Layout; using global::Avalonia.Media; using global::Avalonia.VisualTree; + using System; using System.Collections.Generic; using System.Linq; @@ -60,7 +61,7 @@ public class TrackerControl : ContentControl /// /// Identifies the dependency property. /// - public static readonly StyledProperty CornerRadiusProperty = AvaloniaProperty.Register(nameof(CornerRadius), 0.0); + public static new readonly StyledProperty CornerRadiusProperty = AvaloniaProperty.Register(nameof(CornerRadius), 0.0); /// /// Identifies the dependency property. @@ -139,6 +140,11 @@ static TrackerControl() { ClipToBoundsProperty.OverrideDefaultValue(false); PositionProperty.Changed.AddClassHandler(PositionChanged); + + // The border is built by UpdatePositionAndBorder, so it must be rebuilt when the shape changes too + CornerRadiusProperty.Changed.AddClassHandler(PositionChanged); + ShowPointerProperty.Changed.AddClassHandler(PositionChanged); + DistanceProperty.Changed.AddClassHandler(PositionChanged); } /// @@ -240,7 +246,7 @@ public bool ShowPointer /// /// Gets or sets the corner radius (only used when ShowPoint=false). /// - public double CornerRadius + public new double CornerRadius { get { @@ -488,7 +494,9 @@ private Geometry CreateBorderGeometry( va == VerticalAlignment.Top ? m : 0, ha == HorizontalAlignment.Right ? m : 0, va == VerticalAlignment.Bottom ? m : 0); - return new RectangleGeometry(rect)/* { RadiusX = this.CornerRadius, RadiusY = this.CornerRadius }*/; + // The radius is at most half of the smaller side, otherwise the rounded corners overlap + var radius = Math.Max(0, Math.Min(CornerRadius, Math.Min(width, height) / 2)); + return new RectangleGeometry(rect, radius, radius); } /// From 70663aaa37eaef1e34c64875dc700107d3772a90 Mon Sep 17 00:00:00 2001 From: izakusilov Date: Sat, 24 Oct 2026 13:47:52 +0000 Subject: [PATCH 04/51] Apply default styles to derived plot controls --- Source/OxyPlot.Avalonia/Themes/Default.axaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/OxyPlot.Avalonia/Themes/Default.axaml b/Source/OxyPlot.Avalonia/Themes/Default.axaml index 6b5dcf4..43f776c 100644 --- a/Source/OxyPlot.Avalonia/Themes/Default.axaml +++ b/Source/OxyPlot.Avalonia/Themes/Default.axaml @@ -5,7 +5,9 @@ xmlns:local="http://oxyplot.org/avalonia" xmlns:oxy="clr-namespace:OxyPlot;assembly=OxyPlot"> - - -