Return focus to PlacementTarget on close

6 years ago · c941a3d1b9
1 changed files with 13 additions and 0 deletions
--- a/src/Avalonia.Controls/Primitives/Popup.cs
+++ b/src/Avalonia.Controls/Primitives/Popup.cs
@ -586,6 +586,19 @@ namespace Avalonia.Controls.Primitives
            }

            Closed?.Invoke(this, EventArgs.Empty);
+
+            if(PlacementTarget != null)
+            {
+                FocusManager.Instance?.Focus(PlacementTarget);
+            }
+            else
+            {
+                var anc = this.GetLogicalAncestors().OfType<IControl>().FirstOrDefault();
+                if (anc != null)
+                {
+                    FocusManager.Instance?.Focus(anc);
+                }
+            }
        }

        private void ListenForNonClientClick(RawInputEventArgs e)