Move the Close... actions to a nested menu on the tab (#15250)

A resurrection of the original nested "Close" menu from #7728. We discovered that nested flyouts crash in #8238. Those are fixed now though! So we can bring this back. This also includes the "Close Pane" item from #15198.
microsoft · Apr 28, 2023 · c4944c3 · c4944c3
1 parent 70e44c7
commit c4944c3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/src/cascadia/TerminalApp/TabBase.cpp b/src/cascadia/TerminalApp/TabBase.cpp
@@ -70,8 +70,9 @@ namespace winrt::TerminalApp::implementation
     // Arguments:
     // - flyout - the menu flyout to which the close items must be appended
     // Return Value:
-    // - <none>
-    void TabBase::_AppendCloseMenuItems(winrt::Windows::UI::Xaml::Controls::MenuFlyout flyout)
+    // - the sub-item that we use for all the nested "close" entries. This
+    //   enables subclasses to add their own entries to this menu.
+    winrt::Windows::UI::Xaml::Controls::MenuFlyoutSubItem TabBase::_AppendCloseMenuItems(winrt::Windows::UI::Xaml::Controls::MenuFlyout flyout)
     {
         auto weakThis{ get_weak() };
 
@@ -120,15 +121,16 @@ namespace winrt::TerminalApp::implementation
         WUX::Controls::ToolTipService::SetToolTip(closeTabMenuItem, box_value(closeTabToolTip));
         Automation::AutomationProperties::SetHelpText(closeTabMenuItem, closeTabToolTip);
 
-        // GH#8238 append the close menu items to the flyout itself until crash in XAML is fixed
-        //Controls::MenuFlyoutSubItem closeSubMenu;
-        //closeSubMenu.Text(RS_(L"TabCloseSubMenu"));
-        //closeSubMenu.Items().Append(_closeTabsAfterMenuItem);
-        //closeSubMenu.Items().Append(_closeOtherTabsMenuItem);
-        //flyout.Items().Append(closeSubMenu);
-        flyout.Items().Append(_closeTabsAfterMenuItem);
-        flyout.Items().Append(_closeOtherTabsMenuItem);
+        // Create a sub-menu for our extended close items.
+        Controls::MenuFlyoutSubItem closeSubMenu;
+        closeSubMenu.Text(RS_(L"TabCloseSubMenu"));
+        closeSubMenu.Items().Append(_closeTabsAfterMenuItem);
+        closeSubMenu.Items().Append(_closeOtherTabsMenuItem);
+        flyout.Items().Append(closeSubMenu);
+
         flyout.Items().Append(closeTabMenuItem);
+
+        return closeSubMenu;
     }
 
     // Method Description:

diff --git a/src/cascadia/TerminalApp/TabBase.h b/src/cascadia/TerminalApp/TabBase.h
@@ -65,7 +65,7 @@ namespace winrt::TerminalApp::implementation
 
         virtual void _MakeTabViewItem();
 
-        void _AppendCloseMenuItems(winrt::Windows::UI::Xaml::Controls::MenuFlyout flyout);
+        winrt::Windows::UI::Xaml::Controls::MenuFlyoutSubItem _AppendCloseMenuItems(winrt::Windows::UI::Xaml::Controls::MenuFlyout flyout);
         void _EnableCloseMenuItems();
         void _CloseTabsAfter();
         void _CloseOtherTabs();

diff --git a/src/cascadia/TerminalApp/TerminalTab.cpp b/src/cascadia/TerminalApp/TerminalTab.cpp
@@ -1404,7 +1404,7 @@ namespace winrt::TerminalApp::implementation
         contextMenuFlyout.Items().Append(renameTabMenuItem);
         contextMenuFlyout.Items().Append(duplicateTabMenuItem);
         contextMenuFlyout.Items().Append(splitTabMenuItem);
-        contextMenuFlyout.Items().Append(closePaneMenuItem);
+
         contextMenuFlyout.Items().Append(exportTabMenuItem);
         contextMenuFlyout.Items().Append(findMenuItem);
         contextMenuFlyout.Items().Append(menuSeparator);
@@ -1423,7 +1423,9 @@ namespace winrt::TerminalApp::implementation
                 }
             }
         });
-        _AppendCloseMenuItems(contextMenuFlyout);
+        auto closeSubMenu = _AppendCloseMenuItems(contextMenuFlyout);
+        closeSubMenu.Items().Append(closePaneMenuItem);
+
         TabViewItem().ContextFlyout(contextMenuFlyout);
     }