Skip to content

Dismiss the workspace menu when showing the delete confirmation #20648

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

Open
bucketbase26 (ayush-singh-0601) wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −1
Open

Dismiss the workspace menu when showing the delete confirmation #20648

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
13 changes: 12 additions & 1 deletion src/cascadia/TerminalApp/TerminalPage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5796,13 +5796,24 @@ namespace winrt::TerminalApp::implementation

auto trashIcon = UI::IconPathConverter::IconWUX(L"\xE74D"); // Delete glyph

deleteItem.Click([weakThis{ get_weak() }, name](auto&&, auto&&) -> safe_void_coroutine {
deleteItem.Click([weakThis{ get_weak() }, name, deleteFlyout](auto&&, auto&&) -> safe_void_coroutine {
auto page{ weakThis.get() };
if (!page)
{
co_return;
}

// The delete item lives in an attached context flyout, so
// clicking it does not dismiss the parent workspace menu.
// ContentDialog is a separate popup and will not light-
// dismiss that menu either, which leaves it sitting over
// the confirmation (GH#20636). Close both first.
deleteFlyout.Hide();
if (page->_workspaceFlyout)
{
page->_workspaceFlyout.Hide();
}

// Build and show a confirmation ContentDialog.
ContentDialog dialog{};
dialog.Title(winrt::box_value(winrt::hstring{ RS_fmt(L"ConfirmDeleteWorkspaceTitle", name) }));
Expand Down