Browse Source

if TreeView has a selecteditem that isnt really part of the tree... then do not crash tab navigation.

pull/4969/head
Dan Walmsley 5 years ago
parent
commit
d3b43efe16
  1. 5
      src/Avalonia.Controls/TreeView.cs

5
src/Avalonia.Controls/TreeView.cs

@ -378,10 +378,11 @@ namespace Avalonia.Controls
{ {
if (!this.IsVisualAncestorOf(element)) if (!this.IsVisualAncestorOf(element))
{ {
IControl result = _selectedItem != null ? var result = _selectedItem != null ?
ItemContainerGenerator.Index.ContainerFromItem(_selectedItem) : ItemContainerGenerator.Index.ContainerFromItem(_selectedItem) :
ItemContainerGenerator.ContainerFromIndex(0); ItemContainerGenerator.ContainerFromIndex(0);
return (true, result);
return (result is {}, result); // SelectedItem may not be in the treeview.
} }
return (true, null); return (true, null);

Loading…
Cancel
Save