uniformly apply tabability criteria AscensionGameDev#2574 (AscensionGameDev#2577)

Author: pandinocoder

Intersect.Client.Framework/Gwen/Control/Base.cs

@@ -4144,9 +4144,7 @@ protected virtual bool OnKeyTab(bool down, bool shift = false)
         Base? next;
         lock (canvas._tabQueue)
         {
-            var hasValid = canvas._tabQueue.Any(
-                control => control is { IsDisabledByTree: false, IsHiddenByTree: false }
-            );
+            var hasValid = canvas._tabQueue.Any(IsNodeValidTabTarget);
             if (!hasValid)
             {
                 return true;
@@ -4188,10 +4186,10 @@ protected virtual bool OnKeyTab(bool down, bool shift = false)
                     canvas._tabQueue.AddLast(next);
                 }
             }
-            while (next.IsHiddenByTree || next.IsDisabledByTree || !next.IsTabable);
+            while (!IsNodeValidTabTarget(next));
         }
 
-        if (next is { IsTabable: true, IsDisabledByTree: false, IsHiddenByTree: false })
+        if (IsNodeValidTabTarget(next))
         {
             Console.WriteLine($"Focusing {next.ParentQualifiedName} ({next.GetFullishName()})");
             next.Focus(moveMouse: next is not TextBox);
@@ -4202,6 +4200,9 @@ protected virtual bool OnKeyTab(bool down, bool shift = false)
         return true;
     }
 
+    private static bool IsNodeValidTabTarget(Base? node) =>
+        node is { IsDisabledByTree: false, IsHiddenByTree: false, IsTabable: true };
+
     /// <summary>
     ///     Handler for Space keyboard event.
     /// </summary>