@@ -94,30 +94,27 @@ protected override void OnKeyDown(KeyRoutedEventArgs e)
94
94
}
95
95
else
96
96
{
97
- autocomplete = View . Autocomplete ;
97
+ autocomplete = View ? . Autocomplete ;
98
98
autocompleteList = ControlledList ;
99
99
}
100
100
101
101
var modifiers = WindowContext . KeyModifiers ( ) ;
102
102
103
- if ( e . Key is VirtualKey . Up or VirtualKey . Down )
103
+ if ( e . Key is VirtualKey . Up or VirtualKey . Down && modifiers == VirtualKeyModifiers . None )
104
104
{
105
- if ( e . Key is VirtualKey . Up or VirtualKey . Down && modifiers == VirtualKeyModifiers . None )
105
+ if ( autocompleteList != null && autocompleteList . Items . Count > 0 && autocomplete ? . Orientation == Orientation . Vertical )
106
106
{
107
- if ( autocompleteList != null && autocompleteList . Items . Count > 0 && autocomplete ? . Orientation == Orientation . Vertical )
108
- {
109
- autocompleteList . SelectionMode = ListViewSelectionMode . Single ;
110
-
111
- var index = e . Key == VirtualKey . Up ? - 1 : 1 ;
112
- var next = autocompleteList . SelectedIndex + index ;
113
- if ( next >= 0 && next < autocomplete . Count )
114
- {
115
- autocompleteList . SelectedIndex = next ;
116
- autocompleteList . ScrollIntoView ( autocompleteList . SelectedItem ) ;
117
- }
107
+ autocompleteList . SelectionMode = ListViewSelectionMode . Single ;
118
108
119
- e . Handled = true ;
109
+ var index = e . Key == VirtualKey . Up ? - 1 : 1 ;
110
+ var next = autocompleteList . SelectedIndex + index ;
111
+ if ( next >= 0 && next < autocomplete . Count )
112
+ {
113
+ autocompleteList . SelectedIndex = next ;
114
+ autocompleteList . ScrollIntoView ( autocompleteList . SelectedItem ) ;
120
115
}
116
+
117
+ e . Handled = true ;
121
118
}
122
119
}
123
120
else if ( e . Key is VirtualKey . Left or VirtualKey . Right && modifiers == VirtualKeyModifiers . None )
0 commit comments