Supporting Avalonia 11

Avalonia.Controlz/Avalonia.Controlz.csproj

@@ -1,38 +1,47 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\Directory.build.props" />
-
   <PropertyGroup>
-		<TargetFramework>netcoreapp3.1</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
 		<IsPackable>true</IsPackable>
+		<Platforms>AnyCPU;x64;x86</Platforms>
 	</PropertyGroup>
-
 	<PropertyGroup>
 		<PackageId>mameolan.Avalonia.Controlz</PackageId>
 		<Description>Standard controls which are not available in Avalonia.</Description>
 		<PackageTags>gui;avalonia;avaloniaui;xaml</PackageTags>
 	</PropertyGroup>
-
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
 	  <DocumentationFile>bin\Debug\Avalonia.Controlz.xml</DocumentationFile>
+   </PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
+	  <DocumentationFile>bin\Debug\Avalonia.Controlz.xml</DocumentationFile>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+	  <DocumentationFile>bin\Debug\Avalonia.Controlz.xml</DocumentationFile>
 	</PropertyGroup>
-
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
 	  <DocumentationFile>bin\Release\Avalonia.Controlz.xml</DocumentationFile>
 	</PropertyGroup>
-
-
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
+	  <DocumentationFile>bin\Release\Avalonia.Controlz.xml</DocumentationFile>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+	  <DocumentationFile>bin\Release\Avalonia.Controlz.xml</DocumentationFile>
+	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Avalonia" Version="0.10.13" />
-		<PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.13" />
-		<PackageReference Include="Avalonia.Desktop" Version="0.10.13" />
-		<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.13" />
-		<PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.13.3" />
-		<PackageReference Include="Avalonia.Xaml.Interactions" Version="0.10.13.3" />
-		<PackageReference Include="Avalonia.Xaml.Interactivity" Version="0.10.13.3" />
+		<PackageReference Include="Avalonia" Version="11.1.4" />
+		<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.1.4" />
+		<PackageReference Include="Avalonia.Desktop" Version="11.1.4" />
+		<PackageReference Include="Avalonia.ReactiveUI" Version="11.1.4" />
+		<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.1.0.4" />
+		<PackageReference Include="Avalonia.Xaml.Interactions" Version="11.1.0.4" />
+		<PackageReference Include="Avalonia.Xaml.Interactivity" Version="11.1.0.4" />
 		<PackageReference Include="GridExtra.Avalonia" Version="0.9.1" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -44,8 +53,4 @@
 		</AvaloniaResource>
 		<AvaloniaResource Include="Assets\*" />
 	</ItemGroup>
-
-
-
-
 </Project>

Avalonia.Controlz/Controls/Slider/SliderEx.cs

@@ -296,10 +296,10 @@ static SliderEx()
             Thumb.DragDeltaEvent.AddClassHandler<SliderEx>((o, e) => OnThumbDragDelta(o, e), RoutingStrategies.Bubble);
             Thumb.DragCompletedEvent.AddClassHandler<SliderEx>((o, e) => OnThumbDragCompleted(o, e), RoutingStrategies.Bubble);
 
-            SelectionStartProperty.Changed.AddClassHandler((Action<SliderEx, AvaloniaPropertyChangedEventArgs>)((o, e) => OnSelectionStartChanged(o, e)));
-            SelectionEndProperty.Changed.AddClassHandler((Action<SliderEx, AvaloniaPropertyChangedEventArgs>)((o, e) => OnSelectionEndChanged(o, e)));
-            ValueProperty.Changed.AddClassHandler((Action<SliderEx, AvaloniaPropertyChangedEventArgs>)((o, e) => OnValueChanged(o, e)));
-            TickPlacementProperty.Changed.AddClassHandler((Action<SliderEx, AvaloniaPropertyChangedEventArgs>)((o, e) => OnTickPlacementChanged(o, e)));
+            SelectionStartProperty.Changed.AddClassHandler<SliderEx>((Action<SliderEx, AvaloniaPropertyChangedEventArgs>)((o, e) => OnSelectionStartChanged(o, e)));
+            SelectionEndProperty.Changed.AddClassHandler<SliderEx>((Action<SliderEx, AvaloniaPropertyChangedEventArgs>)((o,   e) => OnSelectionEndChanged(o, e)));
+            ValueProperty.Changed.AddClassHandler<SliderEx>((Action<SliderEx, AvaloniaPropertyChangedEventArgs>)((o,          e) => OnValueChanged(o, e)));
+            TickPlacementProperty.Changed.AddClassHandler<SliderEx>((Action<SliderEx, AvaloniaPropertyChangedEventArgs>)((o,  e) => OnTickPlacementChanged(o, e)));
         }
 
 
@@ -486,7 +486,7 @@ private void OnIncreaseLargeCommand(object x)
         /// updates the pseudo classes
         /// </summary>
         /// <param name="e"></param>
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> e)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs e)
         {
             base.OnPropertyChanged(e);
             if(e.Property == OrientationProperty && e.NewValue is Orientation newValue)
@@ -915,8 +915,8 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
             //{
             //    _autoToolTip.PlacementTarget = Track != null ? Track.Thumb : null;
             //}
-
-            RaisePropertyChanged(TickPlacementProperty, TickPlacement.None, TickPlacement);
+            //.orig
+            //RaisePropertyChanged(TickPlacementProperty, TickPlacement.None, TickPlacement);
             base.OnApplyTemplate(e);
         }
 

Avalonia.Controlz/Controls/StatusBar/StatusBar.cs

@@ -11,8 +11,8 @@ public class StatusBar : ItemsControl
     {
 
 #warning finish implementation
-        private static readonly FuncTemplate<IPanel> DefaultPanel =
-           new FuncTemplate<IPanel>(() => new DockPanel());
+        private static readonly FuncTemplate<Panel> DefaultPanel =
+           new FuncTemplate<Panel>(() => new DockPanel());
 
         static StatusBar()
         {
@@ -32,14 +32,15 @@ static StatusBar()
         /// creates an item container of an <see cref="StatusBarItem"/>
         /// </summary>
         /// <returns></returns>
-        protected override IItemContainerGenerator CreateItemContainerGenerator()
-        {
-            var itemContainer = new ItemContainerGenerator<StatusBarItem>(
-               this,
-               StatusBarItem.ContentProperty,
-               StatusBarItem.ContentTemplateProperty);
+        //.orig
+        //protected override ItemContainerGenerator CreateItemContainerGenerator()
+        //{
+        //    var itemContainer = new ItemContainerGenerator<StatusBarItem>(
+        //       this,
+        //       StatusBarItem.ContentProperty,
+        //       StatusBarItem.ContentTemplateProperty);
 
-            return itemContainer;
-        }
+        //    return itemContainer;
+        //}
     }
 }

Avalonia.Controlz/Controls/TabPanel.cs

@@ -63,7 +63,7 @@ protected override Size MeasureOverride(Size constraint)
                 int numInCurrentRow = 0;
                 double currentRowWidth = 0;
                 double maxRowWidth = 0;
-                foreach (IControl child in Children)
+                foreach (Control child in Children)
                 {
                     if (child.IsVisible == false)
                         continue;
@@ -107,7 +107,7 @@ protected override Size MeasureOverride(Size constraint)
             }
             else if (tabAlignment == Dock.Left || tabAlignment == Dock.Right)
             {
-                foreach (IControl child in Children)
+                foreach (Control child in Children)
                 {
                     if (child.IsVisible == false)
                         continue;
@@ -131,7 +131,7 @@ protected override Size MeasureOverride(Size constraint)
             return contentSize;
         }
 
-        private Size GetDesiredSizeWithoutMargin(IControl element)
+        private Size GetDesiredSizeWithoutMargin(Control element)
         {
             Thickness margin = (Thickness)element.GetValue(MarginProperty);
             Size desiredSizeWithoutMargin = new Size(
@@ -145,7 +145,7 @@ private double[] GetHeadersSize()
         {
             double[] headerSize = new double[_numHeaders];
             int childIndex = 0;
-            foreach (IControl child in Children)
+            foreach (Control child in Children)
             {
                 if (child.IsVisible == false)
                     continue;
@@ -183,7 +183,7 @@ private void ArrangeHorizontal(Size arrangeSize)
 
             int childIndex = 0;
             int separatorIndex = 0;
-            foreach (IControl child in Children)
+            foreach (Control child in Children)
             {
                 if (child.IsVisible == false)
                     continue;
@@ -235,7 +235,7 @@ private void ArrangeHorizontal(Size arrangeSize)
         private void ArrangeVertical(Size arrangeSize)
         {
             double childOffsetY = 0d;
-            foreach (IControl child in Children)
+            foreach (Control child in Children)
             {
                 if (child.IsVisible)
                 {
@@ -255,7 +255,7 @@ private int GetActiveRow(int[] solution)
             int childIndex = 0;
             if (solution.Length > 0)
             {
-                foreach (IControl child in Children)
+                foreach (Control child in Children)
                 {
                     if (child.IsVisible)
                         continue;
@@ -452,4 +452,4 @@ private int[] CalculateHeaderDistribution(double rowWidthLimit, double[] headerW
             return bestSolution;
         }
     }
-}
+}

Avalonia.Controlz/Controls/TickBar/TickBar.cs

@@ -3,6 +3,7 @@
 using Avalonia.Controlz.Helper;
 using Avalonia.Data;
 using Avalonia.Media;
+using Avalonia.ReactiveUI;
 using System;
 using System.Diagnostics;
 
@@ -609,28 +610,28 @@ public override void Render(DrawingContext dc)
             return;
         }
 
-        private void BindToTemplatedParent(AvaloniaProperty target, AvaloniaProperty source)
-        {
-            //if (!HasNonDefaultValue(target))
-            {
-                //Binding binding = new Binding();
-                //binding.RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent);
-                //binding.Path = source.p//new PropertyPath(source);
-                //SetBinding(target, binding);
-                try
-                {
-                    var sourceBinding = this.GetSubject(source);
-
-                    InstancedBinding instancedBinding = new InstancedBinding(sourceBinding, BindingMode.TwoWay, BindingPriority.TemplatedParent);
-                    BindingOperations.Apply(this, target, instancedBinding, TemplatedParent);
-                }
-                catch (Exception ex)
-                {
-                    Debug.WriteLine(ex.Message);
-                }
-                //Bind(target, ObservableEx.SingleValue(source));
-            }
-        }
+        //private void BindToTemplatedParent(AvaloniaProperty target, AvaloniaProperty source)
+        //{
+        //    //if (!HasNonDefaultValue(target))
+        //    {
+        //        //Binding binding = new Binding();
+        //        //binding.RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent);
+        //        //binding.Path = source.p//new PropertyPath(source);
+        //        //SetBinding(target, binding);
+        //        try
+        //        {
+        //            var sourceBinding = this.GetSubject(source);
+
+        //            InstancedBinding instancedBinding = new InstancedBinding(sourceBinding, BindingMode.TwoWay, BindingPriority.TemplatedParent, true);
+        //            BindingOperations.Apply(this, target, instancedBinding, TemplatedParent);
+        //        }
+        //        catch (Exception ex)
+        //        {
+        //            Debug.WriteLine(ex.Message);
+        //        }
+        //        //Bind(target, ObservableEx.SingleValue(source));
+        //    }
+        //}
 
         /// <summary>
         /// gets the parent <see cref="SliderEx"/>

Avalonia.Controlz/Helper/DoubleUtil.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Windows;
+using System.Drawing;
 using System.Runtime.InteropServices;
 
 namespace Avalonia.Controlz
@@ -209,15 +211,15 @@ public static bool AreClose(Vector vector1, Vector vector2)
         public static bool AreClose(Rect rect1, Rect rect2)
         {
             // If they're both empty, don't bother with the double logic.
-            if (rect1.IsEmpty)
+            if (rect1.Height == 0 && rect1.Width == 0)
             {
-                return rect2.IsEmpty;
+                return !(rect2.Height != 0 || rect2.Width != 0);
             }
 
             // At this point, rect1 isn't empty, so the first thing we can test is
             // rect2.IsEmpty, followed by property-wise compares.
 
-            return (!rect2.IsEmpty) &&
+            return (rect2.Height != 0 || rect2.Width != 0) &&
                 DoubleUtil.AreClose(rect1.X, rect2.X) &&
                 DoubleUtil.AreClose(rect1.Y, rect2.Y) &&
                 DoubleUtil.AreClose(rect1.Height, rect2.Height) &&