Skip to content

fix: [22091] Fixed PopupFlyoutBase.Opening not passing CancelEventArgs #22156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
davidmfritz wants to merge 1 commit into from
+5 −12
Closed

fix: [22091] Fixed PopupFlyoutBase.Opening not passing CancelEventArgs #22156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions samples/ControlCatalog/Pages/ContextFlyoutPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,9 @@ private void ContextFlyoutPage_Closing(object? sender, CancelEventArgs e)
e.Cancel = CancelCloseCheckBox?.IsChecked ?? false;
}

private void ContextFlyoutPage_Opening(object? sender, EventArgs e)
private void ContextFlyoutPage_Opening(object? sender, CancelEventArgs e)
{
if (e is CancelEventArgs cancelArgs)
{
cancelArgs.Cancel = CancelCloseCheckBox?.IsChecked ?? false;
}
e.Cancel = CancelCloseCheckBox?.IsChecked ?? false;
}

private void CloseFlyout(object? sender, RoutedEventArgs e)
Expand Down
2 changes: 1 addition & 1 deletion src/Avalonia.Controls/Flyouts/PopupFlyoutBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ event Action<IPopupHost?>? IPopupHostProvider.PopupHostChanged
}

public event EventHandler<CancelEventArgs>? Closing;
public event EventHandler? Opening;
public event EventHandler<CancelEventArgs>? Opening;

/// <summary>
/// Pre-registers a control as the default placement target for this flyout.
Expand Down
8 changes: 2 additions & 6 deletions tests/Avalonia.Controls.UnitTests/FlyoutTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,7 @@ public void Opening_Is_Cancellable()
f.Opening += (s, e) =>
{
tracker++;
if (e is CancelEventArgs cancelEventArgs)
{
cancelEventArgs.Cancel = true;
}
e.Cancel = true;
};
f.ShowAt(window);

Expand Down Expand Up @@ -834,8 +831,7 @@ public void IsOpen_SetTrue_Cancelled_Opening_Reverts_To_False()

flyout.Opening += (s, e) =>
{
if (e is CancelEventArgs cancelArgs)
cancelArgs.Cancel = true;
e.Cancel = true;
};

flyout.IsOpen = true;
Expand Down