1
0
Эх сурвалжийг харах

Prevent hang in ItemsControl with no focusable controls.

Steven Kirk 6 жил өмнө
parent
commit
60c9015a7f

+ 5 - 3
src/Avalonia.Controls/ItemsControl.cs

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