chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: update selection handling, fix initial offset calculation.

Browse Source
This commit is contained in:
Dong Bin
2025-07-08 13:36:11 +08:00
parent 68f95826c5
commit fb799636d9
8 changed files with 116 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/Ursa/Controls/Anchor/Anchor.cs
View File

@@ -1,4 +1,3 @@
using System.Diagnostics;
using Avalonia;
using Avalonia.Animation;
using Avalonia.Animation.Easings;
@@ -47,7 +46,7 @@ public class Anchor: ItemsControl
}
private CancellationTokenSource _cts = new();
private bool _scrollingFromSelection = false;
private bool _scrollingFromSelection;
private void ScrollToAnchor(Visual target)
{
@@ -114,7 +113,7 @@ public class Anchor: ItemsControl
{
var anchorId = GetAnchorId(item);
if (anchorId is null) continue;
var position = item.TransformToVisual(TargetContainer)?.M32;
var position = item.TransformToVisual(TargetContainer)?.M32 + TargetContainer.Offset.Y;
if (position.HasValue)
{
positions.Add((anchorId, position.Value));
@@ -127,22 +126,14 @@ public class Anchor: ItemsControl
protected override void OnLoaded(RoutedEventArgs e)
{
base.OnLoaded(e);
var items = this.GetVisualDescendants().OfType<AnchorItem>().ToList();
var target = this.TargetContainer;
if (target is null) return;
var targetItems = target.GetVisualDescendants().Where(a => Anchor.GetAnchorId(a) is not null).ToList();
var tops = targetItems.Select(a => (a.TransformToVisual(target)?.M32, GetAnchorId(a)));
var isloaded = TargetContainer?.IsLoaded;
TargetContainer?.AddHandler(ScrollViewer.ScrollChangedEvent, OnScrollChanged);
if (isloaded is true)
TargetContainer?.AddHandler(LoadedEvent, OnTargetContainerLoaded);
if (TargetContainer?.IsLoaded == true)
{
InvalidateAnchorPositions();
}
else
{
TargetContainer.Loaded += (s, args) => InvalidateAnchorPositions();
}
MarkSelectedContainerByPosition();
}
@@ -159,7 +150,7 @@ public class Anchor: ItemsControl
if (source is null) return;
MarkSelectedContainer(source);
var target = TargetContainer?.GetVisualDescendants()
.FirstOrDefault(a => Anchor.GetAnchorId(a) == source?.AnchorId);
.FirstOrDefault(a => Anchor.GetAnchorId(a) == source.AnchorId);
if (target is null) return;
ScrollToAnchor(target);
}
@@ -187,7 +178,7 @@ public class Anchor: ItemsControl
ContainerForItemPreparedOverride(container, item, index);
}
internal AnchorItem? _selectedContainer;
private AnchorItem? _selectedContainer;
internal void MarkSelectedContainer(AnchorItem? item)
{
@@ -210,5 +201,15 @@ public class Anchor: ItemsControl
if (item is null) return;
MarkSelectedContainer(item);
}
protected override void OnUnloaded(RoutedEventArgs e)
{
base.OnUnloaded(e);
TargetContainer?.RemoveHandler(UnloadedEvent, OnTargetContainerLoaded);
}
private void OnTargetContainerLoaded(object? sender, RoutedEventArgs e)
{
InvalidateAnchorPositions();
}
}

21
src/Ursa/Controls/Anchor/AnchorItem.cs
View File

@@ -3,8 +3,8 @@ using Avalonia.Controls;
using Avalonia.Controls.Mixins;
using Avalonia.Controls.Primitives;
using Avalonia.Controls.Templates;
using Avalonia.Input;
using Avalonia.LogicalTree;
using Ursa.Common;
namespace Ursa.Controls;
@@ -19,6 +19,12 @@ public class AnchorItem : HeaderedItemsControl, ISelectable
private static readonly FuncTemplate<Panel?> DefaultPanel =
new(() => new StackPanel());
internal static readonly DirectProperty<AnchorItem, int> LevelProperty =
AvaloniaProperty.RegisterDirect<AnchorItem, int>(
nameof(Level), o => o.Level, (o, v) => o.Level = v);
private int _level;
private Anchor? _root;
static AnchorItem()
@@ -28,6 +34,12 @@ public class AnchorItem : HeaderedItemsControl, ISelectable
ItemsPanelProperty.OverrideDefaultValue<TreeViewItem>(DefaultPanel);
}
public int Level
{
get => _level;
set => SetAndRaise(LevelProperty, ref _level, value);
}
public string? AnchorId
{
get => GetValue(AnchorIdProperty);
@@ -44,17 +56,14 @@ public class AnchorItem : HeaderedItemsControl, ISelectable
{
base.OnAttachedToVisualTree(e);
_root = this.GetLogicalAncestors().OfType<Anchor>().FirstOrDefault();
Level = LogicalHelpers.CalculateDistanceFromLogicalParent<Anchor, AnchorItem>(this);
if (ItemTemplate is null && _root?.ItemTemplate is not null)
{
SetCurrentValue(ItemTemplateProperty, _root.ItemTemplate);
}
if (ItemContainerTheme is null && _root?.ItemContainerTheme is not null)
{
SetCurrentValue(ItemContainerThemeProperty, _root.ItemContainerTheme);
}
}
protected override Control CreateContainerForItemOverride(object? item, int index, object? recycleKey)
{
return EnsureRoot().CreateContainerForItemOverride_INTERNAL(item, index, recycleKey);