Skip to content

Commit 9e969ed

Browse files
authored
Merge pull request #173 from ryanlua/shortcut-content-dialog-events
Add opened and closed events for shortcut control
2 parents 975c530 + 926db7e commit 9e969ed

1 file changed

Lines changed: 16 additions & 0 deletions

File tree

‎dev/DevWinUI/Controls/Native/Shortcut/Shortcut.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ public partial class Shortcut : BaseShortcut
2020
public event EventHandler<ContentDialogButtonClickEventArgs> CloseButtonClick;
2121
public event EventHandler<ContentDialogButtonClickEventArgs> PrimaryButtonClick;
2222
public event EventHandler<ContentDialogButtonClickEventArgs> SecondaryButtonClick;
23+
public event EventHandler<ContentDialogOpenedEventArgs> OpenedContentDialog;
24+
public event EventHandler<ContentDialogClosedEventArgs> ClosedContentDialog;
2325
public event EventHandler<ContentDialogClosingEventArgs> ClosingContentDialog;
2426
public event EventHandler<ShortcutValidationEventArgs>? ValidateShortcut;
2527

@@ -224,6 +226,10 @@ private async void OpenDialog_Click(object sender, RoutedEventArgs e)
224226
};
225227
contentDialog.Style = Application.Current.Resources["DefaultContentDialogStyle"] as Style;
226228

229+
contentDialog.Opened -= OnOpenedContentDialog;
230+
contentDialog.Opened += OnOpenedContentDialog;
231+
contentDialog.Closed -= OnClosedContentDialog;
232+
contentDialog.Closed += OnClosedContentDialog;
227233
contentDialog.Closing -= OnClosingContentDialog;
228234
contentDialog.Closing += OnClosingContentDialog;
229235
contentDialog.PrimaryButtonClick -= OnSaveContentDialog;
@@ -284,6 +290,16 @@ private void OnCancelContentDialog(ContentDialog sender, ContentDialogButtonClic
284290
CloseButtonClick?.Invoke(this, args);
285291
}
286292

293+
private void OnOpenedContentDialog(ContentDialog sender, ContentDialogOpenedEventArgs args)
294+
{
295+
OpenedContentDialog?.Invoke(this, args);
296+
}
297+
298+
private void OnClosedContentDialog(ContentDialog sender, ContentDialogClosedEventArgs args)
299+
{
300+
ClosedContentDialog?.Invoke(this, args);
301+
}
302+
287303
private void OnClosingContentDialog(ContentDialog sender, ContentDialogClosingEventArgs args)
288304
{
289305
contentDialog?.SizeChanged -= OnContentDialogSizeChanged;

0 commit comments

Comments
 (0)