This fixes #5750 specifically, but a little dirty

microsoft · May 6, 2021 · 9ed5e8c · 9ed5e8c
1 parent f518235
commit 9ed5e8c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/src/cascadia/TerminalApp/TabManagement.cpp b/src/cascadia/TerminalApp/TabManagement.cpp
@@ -215,13 +215,21 @@ namespace winrt::TerminalApp::implementation
             }
         });
 
+        // TODO! Combine withthe below.
         newTabImpl->TabRenamerDeactivated([weakThis{ get_weak() }](auto&& /*s*/, auto&& /*e*/) {
             if (const auto page{ weakThis.get() })
             {
                 page->_FocusCurrentTab(false);
             }
         });
 
+        newTabImpl->RequestFocusActiveControl([weakThis{ get_weak() }](auto&& /*s*/, auto&& /*e*/) {
+            if (const auto page{ weakThis.get() })
+            {
+                page->_FocusCurrentTab(false);
+            }
+        });
+
         if (debugConnection) // this will only be set if global debugging is on and tap is active
         {
             auto newControl = _InitControl(settings, debugConnection);

diff --git a/src/cascadia/TerminalApp/TerminalTab.cpp b/src/cascadia/TerminalApp/TerminalTab.cpp
@@ -884,6 +884,12 @@ namespace winrt::TerminalApp::implementation
         newTabFlyout.Items().Append(renameTabMenuItem);
         newTabFlyout.Items().Append(duplicateTabMenuItem);
         newTabFlyout.Items().Append(menuSeparator);
+        newTabFlyout.Closed([weakThis](auto&&, auto&&) {
+            if (auto tab{ weakThis.get() })
+            {
+                tab->_RequestFocusActiveControlHandlers(*tab, nullptr);
+            }
+        });
         _AppendCloseMenuItems(newTabFlyout);
         TabViewItem().ContextFlyout(newTabFlyout);
     }

diff --git a/src/cascadia/TerminalApp/TerminalTab.h b/src/cascadia/TerminalApp/TerminalTab.h
@@ -93,6 +93,7 @@ namespace winrt::TerminalApp::implementation
         DECLARE_EVENT(DuplicateRequested, _DuplicateRequestedHandlers, winrt::delegate<>);
         FORWARDED_TYPED_EVENT(TabRenamerDeactivated, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable, (&_headerControl), RenameEnded);
         TYPED_EVENT(TaskbarProgressChanged, IInspectable, IInspectable);
+        TYPED_EVENT(RequestFocusActiveControl, IInspectable, IInspectable);
 
     private:
         std::shared_ptr<Pane> _rootPane{ nullptr };