From d798919a999cb30192b86adf739e57674b23f84f Mon Sep 17 00:00:00 2001 From: Piero Castillo Date: Fri, 26 Jan 2024 12:15:46 -0500 Subject: [PATCH] fix some errors --- src/Aura.UI.FluentTheme/Aura.UI.FluentTheme.csproj | 1 + .../Controls/AuraTabItemStyles.xaml | 14 ++++++-------- src/Aura.UI/Controls/AuraTabView/AuraTabView.cs | 7 +++---- src/Aura.UI/Controls/BlurryImage/BlurryImage.cs | 2 +- src/Aura.UI/Controls/ProgressRing/ProgressRing.cs | 6 +++--- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/Aura.UI.FluentTheme/Aura.UI.FluentTheme.csproj b/src/Aura.UI.FluentTheme/Aura.UI.FluentTheme.csproj index d519ecc..8e0bb0f 100644 --- a/src/Aura.UI.FluentTheme/Aura.UI.FluentTheme.csproj +++ b/src/Aura.UI.FluentTheme/Aura.UI.FluentTheme.csproj @@ -13,6 +13,7 @@ + diff --git a/src/Aura.UI.FluentTheme/Controls/AuraTabItemStyles.xaml b/src/Aura.UI.FluentTheme/Controls/AuraTabItemStyles.xaml index d6f05fd..a5ccba5 100644 --- a/src/Aura.UI.FluentTheme/Controls/AuraTabItemStyles.xaml +++ b/src/Aura.UI.FluentTheme/Controls/AuraTabItemStyles.xaml @@ -1,7 +1,7 @@  + xmlns:b="using:Avalonia.Xaml.Interactivity.Draggable"> - - - - - - - + + + + + diff --git a/src/Aura.UI/Controls/AuraTabView/AuraTabView.cs b/src/Aura.UI/Controls/AuraTabView/AuraTabView.cs index 35e3594..4ee5d29 100644 --- a/src/Aura.UI/Controls/AuraTabView/AuraTabView.cs +++ b/src/Aura.UI/Controls/AuraTabView/AuraTabView.cs @@ -14,7 +14,7 @@ namespace Aura.UI.Controls /// /// A powered-up TabControl /// - 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) } /// - 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(AvaloniaPropertyChangedEventArgs 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 index 9dfe60d..f7fa47c 100644 --- 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 index 81b68a1..747f38c 100644 --- 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(new DirectPropertyMetadata(100)); - MinimumProperty.OverrideMetadata(new DirectPropertyMetadata(0)); - ValueProperty.OverrideMetadata(new DirectPropertyMetadata(25)); + MaximumProperty.OverrideMetadata(new StyledPropertyMetadata(100)); + MinimumProperty.OverrideMetadata(new StyledPropertyMetadata(0)); + ValueProperty.OverrideMetadata(new StyledPropertyMetadata(25)); AffectsRender(XAngleProperty, YAngleProperty); }