[silmarillion] Fix moving a tab with panes. Now, the non-first panes …

…don't rebuild themselves on move
microsoft · Feb 13, 2023 · 7d903de · 7d903de
1 parent 4eba01f
commit 7d903de
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/cascadia/TerminalApp/ContentManager.cpp b/src/cascadia/TerminalApp/ContentManager.cpp
@@ -35,7 +35,8 @@ namespace winrt::TerminalApp::implementation
     {
         auto content = ControlInteractivity{ settings, unfocusedAppearance, connection };
         content.Closed({ this, &ContentManager::_closedHandler });
-        _content.Insert(content.Id(), content);
+        const auto& contentGuid{ content.Id() };
+        _content.Insert(contentGuid, content);
         return content;
     }
 

diff --git a/src/cascadia/TerminalApp/Pane.cpp b/src/cascadia/TerminalApp/Pane.cpp
@@ -180,7 +180,7 @@ NewTerminalArgs Pane::GetTerminalArgsForPane(const bool asContent) const
 Pane::BuildStartupState Pane::BuildStartupActions(uint32_t currentId, uint32_t nextId, const bool asContent)
 {
     // if we are a leaf then all there is to do is defer to the parent.
-    if (!asContent && _IsLeaf())
+    if (_IsLeaf())
     {
         if (_lastActive)
         {

diff --git a/src/cascadia/TerminalApp/TerminalTab.cpp b/src/cascadia/TerminalApp/TerminalTab.cpp
@@ -442,7 +442,7 @@ namespace winrt::TerminalApp::implementation
     {
         // Give initial ids (0 for the child created with this tab,
         // 1 for the child after the first split.
-        auto state = _rootPane->BuildStartupActions(0, 1);
+        auto state = _rootPane->BuildStartupActions(0, 1, asContent);
 
         {
             ActionAndArgs newTabAction{};