diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp index 1a8fe750af72..4f9f108d8f2c 100644 --- a/src/cascadia/TerminalApp/TerminalPage.cpp +++ b/src/cascadia/TerminalApp/TerminalPage.cpp @@ -3582,7 +3582,6 @@ namespace winrt::TerminalApp::implementation AlwaysOnTopChanged.raise(*this, nullptr); _showTabsFullscreen = _settings.GlobalSettings().ShowTabsFullscreen(); - ShowTabsFullscreenChanged.raise(*this, nullptr); // Settings AllowDependentAnimations will affect whether animations are // enabled application-wide, so we don't need to check it each time we @@ -4021,8 +4020,7 @@ namespace winrt::TerminalApp::implementation } // Method Description: - // - Updates the visibility of the tab row when in fullscreen state and - // raises the ShowTabsFullscreenChanged event. + // - Updates the visibility of the tab row when in fullscreen state. void TerminalPage::SetShowTabsFullscreen(bool newShowTabsFullscreen) { if (_showTabsFullscreen == newShowTabsFullscreen) @@ -4038,7 +4036,6 @@ namespace winrt::TerminalApp::implementation { _UpdateTabView(); } - ShowTabsFullscreenChanged.raise(*this, nullptr); } void TerminalPage::SetFullscreen(bool newFullscreen) diff --git a/src/cascadia/TerminalApp/TerminalPage.h b/src/cascadia/TerminalApp/TerminalPage.h index 61d3cc3710b5..68f6e5c0c608 100644 --- a/src/cascadia/TerminalApp/TerminalPage.h +++ b/src/cascadia/TerminalApp/TerminalPage.h @@ -191,7 +191,6 @@ namespace winrt::TerminalApp::implementation til::typed_event FullscreenChanged; til::typed_event ChangeMaximizeRequested; til::typed_event AlwaysOnTopChanged; - til::typed_event ShowTabsFullscreenChanged; til::typed_event RaiseVisualBell; til::typed_event SetTaskbarProgress; til::typed_event Initialized; diff --git a/src/cascadia/TerminalApp/TerminalPage.idl b/src/cascadia/TerminalApp/TerminalPage.idl index a2ee01e56e6f..56d30eb3d6db 100644 --- a/src/cascadia/TerminalApp/TerminalPage.idl +++ b/src/cascadia/TerminalApp/TerminalPage.idl @@ -95,7 +95,6 @@ namespace TerminalApp event Windows.Foundation.TypedEventHandler FocusModeChanged; event Windows.Foundation.TypedEventHandler FullscreenChanged; event Windows.Foundation.TypedEventHandler AlwaysOnTopChanged; - event Windows.Foundation.TypedEventHandler ShowTabsFullscreenChanged; event Windows.Foundation.TypedEventHandler Initialized; event Windows.Foundation.TypedEventHandler SetTaskbarProgress; event Windows.Foundation.TypedEventHandler IdentifyWindowsRequested; diff --git a/src/cascadia/TerminalApp/TerminalWindow.h b/src/cascadia/TerminalApp/TerminalWindow.h index 05f47f874771..695dea305d0d 100644 --- a/src/cascadia/TerminalApp/TerminalWindow.h +++ b/src/cascadia/TerminalApp/TerminalWindow.h @@ -222,7 +222,6 @@ namespace winrt::TerminalApp::implementation FORWARDED_TYPED_EVENT(FullscreenChanged, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable, _root, FullscreenChanged); FORWARDED_TYPED_EVENT(ChangeMaximizeRequested, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable, _root, ChangeMaximizeRequested); FORWARDED_TYPED_EVENT(AlwaysOnTopChanged, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable, _root, AlwaysOnTopChanged); - FORWARDED_TYPED_EVENT(ShowTabsFullscreenChanged, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable, _root, ShowTabsFullscreenChanged); FORWARDED_TYPED_EVENT(RaiseVisualBell, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable, _root, RaiseVisualBell); FORWARDED_TYPED_EVENT(SetTaskbarProgress, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable, _root, SetTaskbarProgress); FORWARDED_TYPED_EVENT(IdentifyWindowsRequested, Windows::Foundation::IInspectable, Windows::Foundation::IInspectable, _root, IdentifyWindowsRequested); diff --git a/src/cascadia/TerminalApp/TerminalWindow.idl b/src/cascadia/TerminalApp/TerminalWindow.idl index 836d3eb49733..c04027a4f8e7 100644 --- a/src/cascadia/TerminalApp/TerminalWindow.idl +++ b/src/cascadia/TerminalApp/TerminalWindow.idl @@ -123,7 +123,6 @@ namespace TerminalApp event Windows.Foundation.TypedEventHandler FullscreenChanged; event Windows.Foundation.TypedEventHandler ChangeMaximizeRequested; event Windows.Foundation.TypedEventHandler AlwaysOnTopChanged; - event Windows.Foundation.TypedEventHandler ShowTabsFullscreenChanged; event Windows.Foundation.TypedEventHandler RaiseVisualBell; event Windows.Foundation.TypedEventHandler SetTaskbarProgress; event Windows.Foundation.TypedEventHandler IdentifyWindowsRequested; diff --git a/src/cascadia/WindowsTerminal/AppHost.cpp b/src/cascadia/WindowsTerminal/AppHost.cpp index b8b05a5c434e..b36b91d0e817 100644 --- a/src/cascadia/WindowsTerminal/AppHost.cpp +++ b/src/cascadia/WindowsTerminal/AppHost.cpp @@ -338,7 +338,6 @@ void AppHost::Initialize() _revokers.FullscreenChanged = _windowLogic.FullscreenChanged(winrt::auto_revoke, { this, &AppHost::_FullscreenChanged }); _revokers.FocusModeChanged = _windowLogic.FocusModeChanged(winrt::auto_revoke, { this, &AppHost::_FocusModeChanged }); _revokers.AlwaysOnTopChanged = _windowLogic.AlwaysOnTopChanged(winrt::auto_revoke, { this, &AppHost::_AlwaysOnTopChanged }); - _revokers.ShowTabsFullscreenChanged = _windowLogic.ShowTabsFullscreenChanged(winrt::auto_revoke, { this, &AppHost::_ShowTabsFullscreenChanged }); _revokers.RaiseVisualBell = _windowLogic.RaiseVisualBell(winrt::auto_revoke, { this, &AppHost::_RaiseVisualBell }); _revokers.SystemMenuChangeRequested = _windowLogic.SystemMenuChangeRequested(winrt::auto_revoke, { this, &AppHost::_SystemMenuChangeRequested }); _revokers.ChangeMaximizeRequested = _windowLogic.ChangeMaximizeRequested(winrt::auto_revoke, { this, &AppHost::_ChangeMaximizeRequested }); @@ -851,17 +850,6 @@ void AppHost::_AlwaysOnTopChanged(const winrt::Windows::Foundation::IInspectable _window->SetAlwaysOnTop(_windowLogic.AlwaysOnTop()); } -void AppHost::_ShowTabsFullscreenChanged(const winrt::Windows::Foundation::IInspectable&, - const winrt::Windows::Foundation::IInspectable&) -{ - if (_window == nullptr) - { - return; - } - - _window->SetShowTabsFullscreen(_windowLogic.ShowTabsFullscreen()); -} - // Method Description // - Called when the app wants to flash the taskbar, indicating to the user that // something needs their attention diff --git a/src/cascadia/WindowsTerminal/AppHost.h b/src/cascadia/WindowsTerminal/AppHost.h index 96dea48027cb..7e2d8778a2b2 100644 --- a/src/cascadia/WindowsTerminal/AppHost.h +++ b/src/cascadia/WindowsTerminal/AppHost.h @@ -85,8 +85,6 @@ class AppHost : public std::enable_shared_from_this const winrt::Windows::Foundation::IInspectable& arg); void _AlwaysOnTopChanged(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& arg); - void _ShowTabsFullscreenChanged(const winrt::Windows::Foundation::IInspectable& sender, - const winrt::Windows::Foundation::IInspectable& arg); safe_void_coroutine _WindowInitializedHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& arg); @@ -190,7 +188,6 @@ class AppHost : public std::enable_shared_from_this winrt::TerminalApp::TerminalWindow::FullscreenChanged_revoker FullscreenChanged; winrt::TerminalApp::TerminalWindow::FocusModeChanged_revoker FocusModeChanged; winrt::TerminalApp::TerminalWindow::AlwaysOnTopChanged_revoker AlwaysOnTopChanged; - winrt::TerminalApp::TerminalWindow::ShowTabsFullscreenChanged_revoker ShowTabsFullscreenChanged; winrt::TerminalApp::TerminalWindow::RaiseVisualBell_revoker RaiseVisualBell; winrt::TerminalApp::TerminalWindow::SystemMenuChangeRequested_revoker SystemMenuChangeRequested; winrt::TerminalApp::TerminalWindow::ChangeMaximizeRequested_revoker ChangeMaximizeRequested;