Revert "In specific scenarios, focus the active control (#10048)"

This reverts commit aead759.

Author: DHowett

src/cascadia/TerminalApp/SettingsTab.cpp

@@ -62,8 +62,7 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     void SettingsTab::_MakeTabViewItem()
     {
-        TabBase::_MakeTabViewItem();
-
+        TabViewItem(::winrt::MUX::Controls::TabViewItem{});
         Title(RS_(L"SettingsTab"));
         TabViewItem().Header(winrt::box_value(Title()));
     }

src/cascadia/TerminalApp/SettingsTab.h

@@ -33,7 +33,7 @@ namespace winrt::TerminalApp::implementation
         void Focus(winrt::Windows::UI::Xaml::FocusState focusState) override;
 
     private:
-        void _MakeTabViewItem() override;
+        void _MakeTabViewItem();
         winrt::fire_and_forget _CreateIcon();
     };
 }

src/cascadia/TerminalApp/TabBase.cpp

@@ -46,17 +46,9 @@ namespace winrt::TerminalApp::implementation
         auto weakThis{ get_weak() };
 
         // Build the menu
-        Controls::MenuFlyout contextMenuFlyout;
-        // GH#5750 - When the context menu is dismissed with ESC, toss the focus
-        // back to our control.
-        contextMenuFlyout.Closed([weakThis](auto&&, auto&&) {
-            if (auto tab{ weakThis.get() })
-            {
-                tab->_RequestFocusActiveControlHandlers();
-            }
-        });
-        _AppendCloseMenuItems(contextMenuFlyout);
-        TabViewItem().ContextFlyout(contextMenuFlyout);
+        Controls::MenuFlyout newTabFlyout;
+        _AppendCloseMenuItems(newTabFlyout);
+        TabViewItem().ContextFlyout(newTabFlyout);
     }
 
     // Method Description:
@@ -233,24 +225,4 @@ namespace winrt::TerminalApp::implementation
         toolTip.Content(textBlock);
         WUX::Controls::ToolTipService::SetToolTip(TabViewItem(), toolTip);
     }
-
-    // Method Description:
-    // - Initializes a TabViewItem for this Tab instance.
-    // Arguments:
-    // - <none>
-    // Return Value:
-    // - <none>
-    void TabBase::_MakeTabViewItem()
-    {
-        TabViewItem(::winrt::MUX::Controls::TabViewItem{});
-
-        // GH#3609 If the tab was tapped, and no one else was around to handle
-        // it, then ask our parent to toss focus into the active control.
-        TabViewItem().Tapped([weakThis{ get_weak() }](auto&&, auto&&) {
-            if (auto tab{ weakThis.get() })
-            {
-                tab->_RequestFocusActiveControlHandlers();
-            }
-        });
-    }
 }

src/cascadia/TerminalApp/TabBase.h

@@ -25,8 +25,6 @@ namespace winrt::TerminalApp::implementation
         void UpdateTabViewIndex(const uint32_t idx, const uint32_t numTabs);
         void SetKeyMap(const Microsoft::Terminal::Settings::Model::KeyMapping& keymap);
 
-        WINRT_CALLBACK(RequestFocusActiveControl, winrt::delegate<void()>);
-
         WINRT_CALLBACK(Closed, winrt::Windows::Foundation::EventHandler<winrt::Windows::Foundation::IInspectable>);
         WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
 
@@ -53,8 +51,6 @@ namespace winrt::TerminalApp::implementation
         virtual void _CreateContextMenu();
         virtual winrt::hstring _CreateToolTipTitle();
 
-        virtual void _MakeTabViewItem();
-
         void _AppendCloseMenuItems(winrt::Windows::UI::Xaml::Controls::MenuFlyout flyout);
         void _EnableCloseMenuItems();
         void _CloseTabsAfter();

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -866,9 +866,7 @@ namespace winrt::TerminalApp::implementation
             }
         });
 
-        // The tab might want us to toss focus into the control, especially when
-        // transient UIs (like the context menu, or the renamer) are dismissed.
-        newTabImpl->RequestFocusActiveControl([weakThis{ get_weak() }]() {
+        newTabImpl->TabRenamerDeactivated([weakThis{ get_weak() }](auto&& /*s*/, auto&& /*e*/) {
             if (const auto page{ weakThis.get() })
             {
                 if (!page->_newTabButton.Flyout().IsOpen())

src/cascadia/TerminalApp/TerminalTab.cpp

@@ -53,15 +53,6 @@ namespace winrt::TerminalApp::implementation
             }
         });
 
-        // GH#9162 - when the header is done renaming, ask for focus to be
-        // tossed back to the control, rather into ourselves.
-        _headerControl.RenameEnded([weakThis = get_weak()](auto&&, auto&&) {
-            if (auto tab{ weakThis.get() })
-            {
-                tab->_RequestFocusActiveControlHandlers();
-            }
-        });
-
         _UpdateHeaderControlMaxWidth();
 
         // Use our header control as the TabViewItem's header
@@ -92,7 +83,7 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     void TerminalTab::_MakeTabViewItem()
     {
-        TabBase::_MakeTabViewItem();
+        TabViewItem(::winrt::MUX::Controls::TabViewItem{});
 
         TabViewItem().DoubleTapped([weakThis = get_weak()](auto&& /*s*/, auto&& /*e*/) {
             if (auto tab{ weakThis.get() })
@@ -841,22 +832,13 @@ namespace winrt::TerminalApp::implementation
         }
 
         // Build the menu
-        Controls::MenuFlyout contextMenuFlyout;
+        Controls::MenuFlyout newTabFlyout;
         Controls::MenuFlyoutSeparator menuSeparator;
-        contextMenuFlyout.Items().Append(chooseColorMenuItem);
-        contextMenuFlyout.Items().Append(renameTabMenuItem);
-        contextMenuFlyout.Items().Append(menuSeparator);
-
-        // GH#5750 - When the context menu is dismissed with ESC, toss the focus
-        // back to our control.
-        contextMenuFlyout.Closed([weakThis](auto&&, auto&&) {
-            if (auto tab{ weakThis.get() })
-            {
-                tab->_RequestFocusActiveControlHandlers();
-            }
-        });
-        _AppendCloseMenuItems(contextMenuFlyout);
-        TabViewItem().ContextFlyout(contextMenuFlyout);
+        newTabFlyout.Items().Append(chooseColorMenuItem);
+        newTabFlyout.Items().Append(renameTabMenuItem);
+        newTabFlyout.Items().Append(menuSeparator);
+        _AppendCloseMenuItems(newTabFlyout);
+        TabViewItem().ContextFlyout(newTabFlyout);
     }
 
     // Method Description:

src/cascadia/TerminalApp/TerminalTab.h

@@ -89,6 +89,7 @@ namespace winrt::TerminalApp::implementation
         DECLARE_EVENT(ColorSelected, _colorSelected, winrt::delegate<winrt::Windows::UI::Color>);
         DECLARE_EVENT(ColorCleared, _colorCleared, winrt::delegate<>);
         DECLARE_EVENT(TabRaiseVisualBell, _TabRaiseVisualBellHandlers, winrt::delegate<>);
+        FORWARDED_TYPED_EVENT(TabRenamerDeactivated, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable, (&_headerControl), RenameEnded);
 
     private:
         std::shared_ptr<Pane> _rootPane{ nullptr };
@@ -116,7 +117,7 @@ namespace winrt::TerminalApp::implementation
         std::optional<Windows::UI::Xaml::DispatcherTimer> _bellIndicatorTimer;
         void _BellIndicatorTimerTick(Windows::Foundation::IInspectable const& sender, Windows::Foundation::IInspectable const& e);
 
-        void _MakeTabViewItem() override;
+        void _MakeTabViewItem();
 
         winrt::fire_and_forget _UpdateHeaderControlMaxWidth();