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

feat: treeview is not inheriting selecting items control since selected item is not always within item view collection.

Browse Source
This commit is contained in:
rabbitism
2024-04-16 23:35:24 +08:00
parent 1521b07785
commit 4b58825ac4
1 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Ursa/Controls/ComboBox/TreeComboBox.cs
View File

@@ -1,8 +1,11 @@
using System.Collections;
using System.Collections.Specialized;
using System.Data;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.Metadata;
using Avalonia.Controls.Primitives;
using Avalonia.Controls.Selection;
using Avalonia.Controls.Templates;
using Avalonia.Input;
using Avalonia.Layout;
@@ -14,7 +17,7 @@ using Irihi.Avalonia.Shared.Common;
namespace Ursa.Controls;
[TemplatePart(PartNames.PART_Popup, typeof(Popup))]
public class TreeComboBox: SelectingItemsControl
public class TreeComboBox: ItemsControl
{
private Popup? _popup;
@@ -89,6 +92,27 @@ public class TreeComboBox: SelectingItemsControl
ItemsPanelProperty.OverrideDefaultValue<TreeComboBox>(DefaultPanel);
FocusableProperty.OverrideDefaultValue<TreeComboBox>(true);
}
private Control? TreeContainerFromItem(object item)
{
return TreeContainerFromItemInternal(this, item);
static Control? TreeContainerFromItemInternal(ItemsControl itemsControl, object item)
{
Control? control = itemsControl.ContainerFromItem(item);
if(control is not null) return control;
foreach (var child in itemsControl.GetRealizedContainers())
{
if (child is ItemsControl childItemsControl)
{
control = TreeContainerFromItemInternal(childItemsControl, item);
if (control is not null) return control;
}
}
return null;
}
}
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{
@@ -129,19 +153,7 @@ public class TreeComboBox: SelectingItemsControl
if (_popup is not null && _popup.IsOpen && e.Source is Visual v && _popup.IsInsidePopup(v))
{
var container = v.FindLogicalAncestorOfType<TreeComboBoxItem>();
container?.SetValue(IsSelectedProperty, true);
if (container?.Header is Control control)
{
SelectionBoxItem = control.DataContext ?? control.ToString();
// UpdateSelectionFromEventSource(e.Source);
}
else
{
SelectionBoxItem = container?.Header;
// UpdateSelectionFromEventSource(e.Source);
}
SetCurrentValue(IsDropDownOpenProperty, false);
}
else
{