From 3081a07f1c64403a668049d8e0652255b26fc888 Mon Sep 17 00:00:00 2001 From: Jurjen Biewenga Date: Mon, 16 Oct 2017 11:27:06 +0200 Subject: [PATCH] Made the requested changes --- src/Avalonia.Controls/DropDown.cs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/Avalonia.Controls/DropDown.cs b/src/Avalonia.Controls/DropDown.cs index c38f9ffd9e..cdb179cac9 100644 --- a/src/Avalonia.Controls/DropDown.cs +++ b/src/Avalonia.Controls/DropDown.cs @@ -104,7 +104,7 @@ namespace Avalonia.Controls if (!e.Handled) { if (e.Key == Key.F4 || - (e.Key == Key.Down && ((e.Modifiers & InputModifiers.Alt) != 0))) + ((e.Key == Key.Down || e.Key == Key.Up) && ((e.Modifiers & InputModifiers.Alt) != 0))) { IsDropDownOpen = !IsDropDownOpen; e.Handled = true; @@ -117,24 +117,21 @@ namespace Avalonia.Controls if (!IsDropDownOpen) { - if (e.Key == Key.Right) + if (e.Key == Key.Down) { + if (SelectedIndex == -1) + SelectedIndex = 0; + if (++SelectedIndex >= ItemCount) SelectedIndex = 0; e.Handled = true; } - else if (e.Key == Key.Left) + else if (e.Key == Key.Up) { if (--SelectedIndex < 0) SelectedIndex = ItemCount - 1; - e.Handled = true; - } - else if (e.Key == Key.Down) - { - IsDropDownOpen = true; - if (SelectedIndex == -1) - SelectedIndex = 0; + e.Handled = true; } }