fix some errors

PieroCastillo · Jan 26, 2024 · d798919 · d798919
1 parent 14c6803
commit d798919
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git a/src/Aura.UI.FluentTheme/Aura.UI.FluentTheme.csproj b/src/Aura.UI.FluentTheme/Aura.UI.FluentTheme.csproj
@@ -13,6 +13,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="11.0.7" />
+    <PackageReference Include="Avalonia.Xaml.Interactions.Draggable" Version="11.0.6" />
   </ItemGroup>
 	<Import Project="..\..\build\version.props" />
 </Project>
diff --git a/src/Aura.UI.FluentTheme/Controls/AuraTabItemStyles.xaml b/src/Aura.UI.FluentTheme/Controls/AuraTabItemStyles.xaml
@@ -1,7 +1,7 @@
 <Styles  xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:i="using:Avalonia.Xaml.Interactivity"
-        xmlns:b="using:Aura.UI.Behaviors">        
+        xmlns:b="using:Avalonia.Xaml.Interactivity.Draggable">        
 	<Design.PreviewWith>
 		<AuraTabView TabStripPlacement="Right">
 			<AuraTabItem Header="Hello" 
@@ -49,13 +49,11 @@
 	<Style Selector="AuraTabItem[TabStripPlacement=Top]">
 		<Setter Property="CornerRadius" Value="7,7,0,0" />
 		<Setter Property="(i:Interaction.Behaviors)">
-			<b:SharedContentTemplate>
-				<b:SharedContent>
-					<i:BehaviorCollection>
-						<b:ItemDragBehavior Orientation="Horizontal"/>
-					</i:BehaviorCollection>
-				</b:SharedContent>
-			</b:SharedContentTemplate>
+      <i:BehaviorCollectionTemplate>
+        <i:BehaviorCollection>
+          <b:ItemDragBehavior Orientation="Horizontal" />
+        </i:BehaviorCollection>
+      </i:BehaviorCollectionTemplate>
 		</Setter> 
 		<Setter Property="Template">
 			<ControlTemplate>

diff --git a/src/Aura.UI/Controls/AuraTabView/AuraTabView.cs b/src/Aura.UI/Controls/AuraTabView/AuraTabView.cs
@@ -14,7 +14,7 @@ namespace Aura.UI.Controls
     /// <summary>
     /// A powered-up TabControl
     /// </summary>
-    public partial class AuraTabView : TabViewBase, IHeadered, IFootered
+    public partial class AuraTabView : TabViewBase, IFootered
     {
         private Button AdderButton;
         internal double lastselectindex = 0;
@@ -34,7 +34,7 @@ protected void AdderButtonClicked(object sender, RoutedEventArgs e)
         }
 
         /// <inheritdoc/>
-        protected override IItemContainerGenerator CreateItemContainerGenerator()
+        protected override ItemContainerGenerator CreateItemContainerGenerator()
             => new AuraTabItemContainerGenerator(
                 this,
                 AuraTabItem.ContentProperty,
@@ -43,8 +43,7 @@ protected override IItemContainerGenerator CreateItemContainerGenerator()
                 AuraTabItem.IconProperty,
                 AuraTabItem.IsClosableProperty);
 
-
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 

diff --git a/src/Aura.UI/Controls/BlurryImage/BlurryImage.cs b/src/Aura.UI/Controls/BlurryImage/BlurryImage.cs
@@ -71,7 +71,7 @@ public override void Render(DrawingContext context)
             //        .CenterRect(new Rect(destRect.Size / scale));
 
             //    var interpolationMode = RenderOptions.GetBitmapInterpolationMode(this);
-            context.Custom(new BlurImageRender(stream, dstRect, srcRect, BlurLevel, BlurLevel, null));
+            context.Custom(new BlurImageRender(stream, dstRect, srcRect, BlurLevel, BlurLevel));
             // Dispatcher.UIThread.InvokeAsync(InvalidateVisual, DispatcherPriority.Background);
             //}
         }

diff --git a/src/Aura.UI/Controls/ProgressRing/ProgressRing.cs b/src/Aura.UI/Controls/ProgressRing/ProgressRing.cs
@@ -13,9 +13,9 @@ static ProgressRing()
             MinimumProperty.Changed.Subscribe(CalibrateAngles);
             ValueProperty.Changed.Subscribe(CalibrateAngles);
 
-            MaximumProperty.OverrideMetadata<ProgressRing>(new DirectPropertyMetadata<double>(100));
-            MinimumProperty.OverrideMetadata<ProgressRing>(new DirectPropertyMetadata<double>(0));
-            ValueProperty.OverrideMetadata<ProgressRing>(new DirectPropertyMetadata<double>(25));
+            MaximumProperty.OverrideMetadata<ProgressRing>(new StyledPropertyMetadata<double>(100));
+            MinimumProperty.OverrideMetadata<ProgressRing>(new StyledPropertyMetadata<double>(0));
+            ValueProperty.OverrideMetadata<ProgressRing>(new StyledPropertyMetadata<double>(25));
 
             AffectsRender<ProgressRing>(XAngleProperty, YAngleProperty);
         }