Fixing keyboard navigation in backstage

fluentribbon · Dec 14, 2022 · 3f9477b · 3f9477b
1 parent 981f74d
commit 3f9477b
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/Fluent.Ribbon/Controls/Backstage.cs b/Fluent.Ribbon/Controls/Backstage.cs
@@ -238,8 +238,6 @@ static Backstage()
         DefaultStyleKeyProperty.OverrideMetadata(typeof(Backstage), new FrameworkPropertyMetadata(typeof(Backstage)));
         // Disable QAT for this control
         CanAddToQuickAccessToolBarProperty.OverrideMetadata(typeof(Backstage), new FrameworkPropertyMetadata(BooleanBoxes.FalseBox));
-
-        KeyboardNavigation.TabNavigationProperty.OverrideMetadata(typeof(Backstage), new FrameworkPropertyMetadata(KeyboardNavigationMode.Cycle));
     }
 
     /// <summary>
@@ -391,9 +389,6 @@ protected virtual bool Show()
             this.CollapseWindowsFormsHosts(this.ownerWindow);
         }
 
-        var content = this.Content as IInputElement;
-        content?.Focus();
-
         return true;
     }
 
@@ -457,6 +452,11 @@ void HandleStoryboardOnCompleted(object? sender, EventArgs args)
         {
             this.AdornerLayer?.Update();
 
+            if (this.Content?.IsVisible == true)
+            {
+                this.Content.MoveFocus(new TraversalRequest(FocusNavigationDirection.Next));
+            }
+
             storyboard.Completed -= HandleStoryboardOnCompleted;
         }
     }
@@ -498,6 +498,8 @@ void HandleStoryboardOnCompleted(object? sender, EventArgs args)
             this.RestoreParentProperties();
 
             storyboard.Completed -= HandleStoryboardOnCompleted;
+
+            this.Focus();
         }
     }