Browse Source

Fixes

pull/5682/head
amwx 6 years ago
parent
commit
461ea5488c
  1. 4
      src/Avalonia.Controls/Flyouts/FlyoutBase.cs
  2. 8
      src/Avalonia.Controls/TextBox.cs

4
src/Avalonia.Controls/Flyouts/FlyoutBase.cs

@ -113,7 +113,8 @@ namespace Avalonia.Controls.Primitives
}
}
IsOpen = _popup.IsOpen = false;
IsOpen = false;
_popup.IsOpen = false;
// Ensure this isn't active
transientDisposable?.Dispose();
@ -267,7 +268,6 @@ namespace Avalonia.Controls.Primitives
private void OnPopupOpened(object sender, EventArgs e)
{
IsOpen = true;
OnOpened();
}
private void OnPopupClosed(object sender, EventArgs e)

8
src/Avalonia.Controls/TextBox.cs

@ -492,12 +492,8 @@ namespace Avalonia.Controls
{
base.OnLostFocus(e);
if ((ContextFlyout == null) && (ContextMenu == null || !ContextMenu.IsOpen))
{
ClearSelection();
RevealPassword = false;
}
if (ContextFlyout == null || !ContextFlyout.IsOpen)
if ((ContextFlyout == null || !ContextFlyout.IsOpen) &&
(ContextMenu == null || !ContextMenu.IsOpen))
{
ClearSelection();
RevealPassword = false;

Loading…
Cancel
Save