From 60e3c3c9772d413f9ac02d6d1869bfb4a9827eed Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 2 Oct 2019 13:06:15 +0200 Subject: [PATCH] Fix selection after initialization. Fixes first item in menus being selected when menu is shown. --- src/Avalonia.Controls/Primitives/SelectingItemsControl.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs index a50175bdee..6869ea0822 100644 --- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs +++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs @@ -1088,7 +1088,9 @@ namespace Avalonia.Controls.Primitives } else { - SelectedIndex = _updateSelectedIndex != int.MinValue ? _updateSelectedIndex : 0; + SelectedIndex = _updateSelectedIndex != int.MinValue ? + _updateSelectedIndex : + AlwaysSelected ? 0 : -1; } } }