[silmarillion] Pull DetachTab into a method

microsoft · Feb 6, 2023 · ba7b5ae · ba7b5ae
1 parent c282797
commit ba7b5ae
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -2031,6 +2031,20 @@ namespace winrt::TerminalApp::implementation
         return true;
     }
 
+    void TerminalPage::_DetachTab(const winrt::com_ptr<TerminalTab>& terminalTab)
+    {
+        // Collect all the content we're about to detach.
+        if (const auto rootPane = terminalTab->GetRootPane())
+        {
+            rootPane->WalkTree([&](auto p) {
+                if (const auto& control{ p->GetTerminalControl() })
+                {
+                    _manager.Detach(control.ContentGuid());
+                }
+            });
+        }
+    }
+
     bool TerminalPage::_MoveTab(MoveTabArgs args)
     {
         const auto windowId{ args.Window() };
@@ -2039,17 +2053,7 @@ namespace winrt::TerminalApp::implementation
             if (const auto terminalTab{ _GetFocusedTabImpl() })
             {
                 auto startupActions = terminalTab->BuildStartupActions(true);
-
-                // Collect all the content we're about to detach.
-                if (const auto rootPane = terminalTab->GetRootPane())
-                {
-                    rootPane->WalkTree([&](auto p) {
-                        if (const auto& control{ p->GetTerminalControl() })
-                        {
-                            _manager.Detach(control.ContentGuid());
-                        }
-                    });
-                }
+                _DetachTab(terminalTab);
 
                 auto winRtActions{ winrt::single_threaded_vector<ActionAndArgs>(std::move(startupActions)) };
                 // Json::Value json{ Json::objectValue };

diff --git a/src/cascadia/TerminalApp/TerminalPage.h b/src/cascadia/TerminalApp/TerminalPage.h
@@ -495,6 +495,7 @@ namespace winrt::TerminalApp::implementation
         void _onTabDragStarting(winrt::Microsoft::UI::Xaml::Controls::TabView sender, winrt::Microsoft::UI::Xaml::Controls::TabViewTabDragStartingEventArgs e);
         void _onTabStripDragOver(winrt::Windows::Foundation::IInspectable sender, winrt::Windows::UI::Xaml::DragEventArgs e);
         winrt::fire_and_forget _onTabStripDrop(winrt::Windows::Foundation::IInspectable sender, winrt::Windows::UI::Xaml::DragEventArgs e);
+        void _DetachTab(const winrt::com_ptr<TerminalTab>& terminalTab);
 
 #pragma region ActionHandlers
         // These are all defined in AppActionHandlers.cpp