From a0554d7add7664ceb7deee6f4e0fdccc18e34a80 Mon Sep 17 00:00:00 2001 From: Dong Bin Date: Tue, 8 Jul 2025 15:11:38 +0800 Subject: [PATCH] feat: update per review. --- src/Ursa/Common/LogicalHelpers.cs | 4 ++-- src/Ursa/Controls/Anchor/Anchor.cs | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Ursa/Common/LogicalHelpers.cs b/src/Ursa/Common/LogicalHelpers.cs index 4a17487..73b5f17 100644 --- a/src/Ursa/Common/LogicalHelpers.cs +++ b/src/Ursa/Common/LogicalHelpers.cs @@ -5,7 +5,7 @@ namespace Ursa.Common; public static class LogicalHelpers { - public static int CalculateDistanceFromLogicalParent(TItem? item, int @default = -1) + public static int CalculateDistanceFromLogicalParent(TItem? item, int defaultValue = -1) where T : class where TItem : ILogical { @@ -16,6 +16,6 @@ public static class LogicalHelpers if (logical is TItem) result++; logical = logical.LogicalParent; } - return item is not null ? result : @default; + return item is not null ? result : defaultValue; } } \ No newline at end of file diff --git a/src/Ursa/Controls/Anchor/Anchor.cs b/src/Ursa/Controls/Anchor/Anchor.cs index 2ecf018..e9c3566 100644 --- a/src/Ursa/Controls/Anchor/Anchor.cs +++ b/src/Ursa/Controls/Anchor/Anchor.cs @@ -201,7 +201,8 @@ public class Anchor : ItemsControl protected override void OnUnloaded(RoutedEventArgs e) { base.OnUnloaded(e); - TargetContainer?.RemoveHandler(UnloadedEvent, OnTargetContainerLoaded); + TargetContainer?.RemoveHandler(LoadedEvent, OnTargetContainerLoaded); + TargetContainer?.RemoveHandler(ScrollViewer.ScrollChangedEvent, OnScrollChanged); } private void OnTargetContainerLoaded(object? sender, RoutedEventArgs e)