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

Merge pull request #588 from irihitech/selection

Browse Source 
Fix various issues for SelectionList
This commit is contained in:
Dong Bin
2025-02-27 15:54:32 +08:00
committed by GitHub
parent 55031c58c7 1e20c81b7d
commit bb6d457338
3 changed files with 52 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
demo/Ursa.Demo/Pages/SelectionBoxDemo.axaml → demo/Ursa.Demo/Pages/SelectionListDemo.axaml
View File

@@ -12,10 +12,14 @@
x:DataType="vm:SelectionListDemoViewModel"
mc:Ignorable="d">
<StackPanel HorizontalAlignment="Left">
<u:SelectionList ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}">
<u:SelectionList
Width="600"
HorizontalAlignment="Center"
ItemsSource="{Binding Items}"
SelectedItem="{Binding SelectedItem}">
<u:SelectionList.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation="Horizontal" />
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal" />
</ItemsPanelTemplate>
</u:SelectionList.ItemsPanel>
</u:SelectionList>
@@ -36,9 +40,9 @@
<DataTemplate>
<Panel Height="40">
<TextBlock
Classes.Active="{Binding $parent[u:SelectionListItem].IsSelected, Mode=OneWay}"
Margin="8,0"
VerticalAlignment="Center"
Classes.Active="{Binding $parent[u:SelectionListItem].IsSelected, Mode=OneWay}"
Text="{Binding}">
<TextBlock.Styles>
<Style Selector="TextBlock.Active">
@@ -50,6 +54,14 @@
</DataTemplate>
</u:SelectionList.ItemTemplate>
</u:SelectionList>
<Button Command="{Binding Clear}">Clear</Button>
<SplitButton Content="Button With Selection">
<SplitButton.Flyout>
<Flyout>
<u:SelectionList ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}" />
</Flyout>
</SplitButton.Flyout>
</SplitButton>
<Button Margin="0 12" Command="{Binding Clear}">Clear</Button>
</StackPanel>
</UserControl>

0
demo/Ursa.Demo/Pages/SelectionBoxDemo.axaml.cs → demo/Ursa.Demo/Pages/SelectionListDemo.axaml.cs
View File

57
src/Ursa/Controls/SelectionList/SelectionList.cs
View File

@@ -14,34 +14,35 @@ using Irihi.Avalonia.Shared.Helpers;
namespace Ursa.Controls;
[TemplatePart(PART_Indicator, typeof(ContentPresenter))]
public class SelectionList: SelectingItemsControl
public class SelectionList : SelectingItemsControl
{
public const string PART_Indicator = "PART_Indicator";
private static readonly FuncTemplate<Panel?> DefaultPanel = new(() => new StackPanel());
public static readonly StyledProperty<Control?> IndicatorProperty =
AvaloniaProperty.Register<SelectionList, Control?>(
nameof(Indicator));
private ImplicitAnimationCollection? _implicitAnimations;
private ContentPresenter? _indicator;
public static readonly StyledProperty<Control?> IndicatorProperty = AvaloniaProperty.Register<SelectionList, Control?>(
nameof(Indicator));
public Control? Indicator
{
get => GetValue(IndicatorProperty);
set => SetValue(IndicatorProperty, value);
}
static SelectionList()
{
SelectionModeProperty.OverrideMetadata<SelectionList>(
new StyledPropertyMetadata<SelectionMode>(
defaultValue: SelectionMode.Single,
coerce: (_, _) => SelectionMode.Single)
);
SelectionMode.Single,
coerce: (_, _) => SelectionMode.Single)
);
SelectedItemProperty.Changed.AddClassHandler<SelectionList, object?>((list, args) =>
list.OnSelectedItemChanged(args));
}
public Control? Indicator
{
get => GetValue(IndicatorProperty);
set => SetValue(IndicatorProperty, value);
}
private void OnSelectedItemChanged(AvaloniaPropertyChangedEventArgs<object?> args)
{
var newValue = args.NewValue.Value;
@@ -50,31 +51,36 @@ public class SelectionList: SelectingItemsControl
OpacityProperty.SetValue(0d, _indicator);
return;
}
var container = ContainerFromItem(newValue);
if (container is null)
{
OpacityProperty.SetValue(0d, _indicator);
return;
}
OpacityProperty.SetValue(1d, _indicator);
InvalidateMeasure();
InvalidateArrange();
// InvalidateArrange();
}
protected override Size ArrangeOverride(Size finalSize)
{
var size = base.ArrangeOverride(finalSize);
if(_indicator is not null && SelectedItem is not null)
if (_indicator is not null && SelectedItem is not null)
{
var container = ContainerFromItem(SelectedItem);
if (container is null) return size;
_indicator.Arrange(container.Bounds);
var bounds = container.Bounds;
if (ItemsPanelRoot?.Bounds.Position is { } p) bounds = bounds.Translate(p);
_indicator.Arrange(bounds);
}
else
{
// This is a hack. The indicator is not visible, so we arrange it to a 1x1 rectangle
_indicator?.Arrange(new Rect(new Point(), new Size(1, 1)));
}
return size;
}
@@ -91,19 +97,21 @@ public class SelectionList: SelectingItemsControl
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{
base.OnApplyTemplate(e);
_indicator= e.NameScope.Find<ContentPresenter>(PART_Indicator);
EnsureIndicatorAnimation();
_indicator = e.NameScope.Find<ContentPresenter>(PART_Indicator);
}
protected override void OnLoaded(RoutedEventArgs e)
{
base.OnLoaded(e);
if(_indicator is not null && SelectedItem is not null)
EnsureIndicatorAnimation();
if (_indicator is not null && SelectedItem is not null)
{
var container = ContainerFromItem(SelectedItem);
if (container is null) return;
_indicator.Opacity = 1;
_indicator.Arrange(container.Bounds);
var bounds = container.Bounds;
if (ItemsPanelRoot?.Bounds.Position is { } p) bounds = bounds.Translate(p);
_indicator.Arrange(bounds);
}
}
@@ -113,10 +121,7 @@ public class SelectionList: SelectingItemsControl
{
_indicator.Opacity = 0;
SetUpAnimation();
if (ElementComposition.GetElementVisual(_indicator) is { } v)
{
v.ImplicitAnimations = _implicitAnimations;
}
if (ElementComposition.GetElementVisual(_indicator) is { } v) v.ImplicitAnimations = _implicitAnimations;
}
}
@@ -156,10 +161,8 @@ public class SelectionList: SelectingItemsControl
{
var hotkeys = Application.Current!.PlatformSettings?.HotkeyConfiguration;
if (e.Key.ToNavigationDirection() is { } direction && direction.IsDirectional())
{
if (e.Key.ToNavigationDirection() is { } direction && direction.IsDirectional())
e.Handled |= MoveSelection(direction, WrapSelection);
}
base.OnKeyDown(e);
}
}