Browse Source

Prevent hang in ItemsControl with no focusable controls.

pull/3096/head
Steven Kirk 7 years ago
parent
commit
60c9015a7f
  1. 8
      src/Avalonia.Controls/ItemsControl.cs

8
src/Avalonia.Controls/ItemsControl.cs

@ -489,18 +489,20 @@ namespace Avalonia.Controls
bool wrap) bool wrap)
{ {
IInputElement result; IInputElement result;
var c = from;
do do
{ {
result = container.GetControl(direction, from, wrap); result = container.GetControl(direction, c, wrap);
from ??= result;
if (result?.Focusable == true) if (result?.Focusable == true)
{ {
return result; return result;
} }
from = result; c = result;
} while (from != null); } while (c != null && c != from);
return null; return null;
} }

Loading…
Cancel
Save