Browse Source

focus DropDown after DropDown popup closed, otherwise focus is unpredicatable

pull/2122/head
Andrey Kunchev 8 years ago
parent
commit
16ebfb5be9
  1. 12
      src/Avalonia.Controls/DropDown.cs

12
src/Avalonia.Controls/DropDown.cs

@ -179,10 +179,22 @@ namespace Avalonia.Controls
if (_popup != null) if (_popup != null)
{ {
_popup.Opened -= PopupOpened; _popup.Opened -= PopupOpened;
_popup.Closed -= PopupClosed;
} }
_popup = e.NameScope.Get<Popup>("PART_Popup"); _popup = e.NameScope.Get<Popup>("PART_Popup");
_popup.Opened += PopupOpened; _popup.Opened += PopupOpened;
_popup.Closed += PopupClosed;
base.OnTemplateApplied(e);
}
private void PopupClosed(object sender, EventArgs e)
{
if (Focusable)
{
Focus();
}
} }
private void PopupOpened(object sender, EventArgs e) private void PopupOpened(object sender, EventArgs e)

Loading…
Cancel
Save