Enable fullscreen mode

doc/cascadia/SettingsSchema.md

@@ -133,6 +133,7 @@ Bindings listed below are per the implementation in `src/cascadia/TerminalApp/Ap
 - moveFocusRight
 - moveFocusUp
 - moveFocusDown
+- toggleFullscreen
 
 ## Background Images and Icons
 Some Terminal settings allow you to specify custom background images and icons. It is recommended that custom images and icons are stored in system-provided folders and are referred to using the correct [URI Schemes](https://docs.microsoft.com/en-us/windows/uwp/app-resources/uri-schemes). URI Schemes provide a way to reference files independent of their physical paths (which may change in the future).
@@ -176,4 +177,4 @@ For example:
 
 With these settings, your Terminal's Ubuntu profile would look similar to this:
 
-![Custom icon and background image](../images/custom-icon-and-background-image.jpg)
+![Custom icon and background image](../images/custom-icon-and-background-image.jpg)

doc/cascadia/profiles.schema.json

@@ -65,7 +65,8 @@
             "switchToTab5",
             "switchToTab6",
             "switchToTab7",
-            "switchToTab8"
+            "switchToTab8",
+            "toggleFullscreen"
           ],
           "type": "string"
         },
@@ -535,4 +536,4 @@
       ]
     }
   ]
-}
+}

src/cascadia/TerminalApp/App.cpp

@@ -662,34 +662,6 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
-    // Methods that proxy typed event handlers through TerminalPage
-    winrt::event_token App::SetTitleBarContent(Windows::Foundation::TypedEventHandler<winrt::Windows::Foundation::IInspectable, winrt::Windows::UI::Xaml::UIElement> const& handler)
-    {
-        return _root->SetTitleBarContent(handler);
-    }
-    void App::SetTitleBarContent(winrt::event_token const& token) noexcept
-    {
-        return _root->SetTitleBarContent(token);
-    }
-
-    winrt::event_token App::TitleChanged(Windows::Foundation::TypedEventHandler<winrt::Windows::Foundation::IInspectable, winrt::hstring> const& handler)
-    {
-        return _root->TitleChanged(handler);
-    }
-    void App::TitleChanged(winrt::event_token const& token) noexcept
-    {
-        return _root->TitleChanged(token);
-    }
-
-    winrt::event_token App::LastTabClosed(Windows::Foundation::TypedEventHandler<winrt::Windows::Foundation::IInspectable, winrt::TerminalApp::LastTabClosedEventArgs> const& handler)
-    {
-        return _root->LastTabClosed(handler);
-    }
-    void App::LastTabClosed(winrt::event_token const& token) noexcept
-    {
-        return _root->LastTabClosed(token);
-    }
-
     // -------------------------------- WinRT Events ---------------------------------
     // Winrt events need a method for adding a callback to the event and removing the callback.
     // These macros will define them both for you.

src/cascadia/TerminalApp/App.h

@@ -44,9 +44,6 @@ namespace winrt::TerminalApp::implementation
         void WindowCloseButtonClicked();
 
         // -------------------------------- WinRT Events ---------------------------------
-        DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(TitleChanged, _titleChangeHandlers, winrt::Windows::Foundation::IInspectable, winrt::hstring);
-        DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(LastTabClosed, _lastTabClosedHandlers, winrt::Windows::Foundation::IInspectable, winrt::TerminalApp::LastTabClosedEventArgs);
-        DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(SetTitleBarContent, _setTitleBarContentHandlers, winrt::Windows::Foundation::IInspectable, winrt::Windows::UI::Xaml::UIElement);
         DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(RequestedThemeChanged, _requestedThemeChangedHandlers, TerminalApp::App, winrt::Windows::UI::Xaml::ElementTheme);
 
     private:
@@ -82,6 +79,14 @@ namespace winrt::TerminalApp::implementation
         void _ReloadSettings();
 
         void _ApplyTheme(const Windows::UI::Xaml::ElementTheme& newTheme);
+
+        // These are events that are handled by the TerminalPage, but are
+        // exposed through the App. This macro is used to forward the event
+        // directly to them.
+        FORWARDED_TYPED_EVENT(SetTitleBarContent, winrt::Windows::Foundation::IInspectable, winrt::Windows::UI::Xaml::UIElement, _root, SetTitleBarContent);
+        FORWARDED_TYPED_EVENT(TitleChanged, winrt::Windows::Foundation::IInspectable, winrt::hstring, _root, TitleChanged);
+        FORWARDED_TYPED_EVENT(LastTabClosed, winrt::Windows::Foundation::IInspectable, winrt::TerminalApp::LastTabClosedEventArgs, _root, LastTabClosed);
+        FORWARDED_TYPED_EVENT(ToggleFullscreen, winrt::Windows::Foundation::IInspectable, winrt::TerminalApp::ToggleFullscreenEventArgs, _root, ToggleFullscreen);
     };
 }
 

src/cascadia/TerminalApp/App.idl

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
+import "../TerminalPage.idl";
+
 namespace TerminalApp
 {
     enum LaunchMode
@@ -9,10 +11,8 @@ namespace TerminalApp
         MaximizedMode,
     };
 
-    delegate void LastTabClosedEventArgs();
     [default_interface] runtimeclass App : Microsoft.Toolkit.Win32.UI.XamlHost.XamlApplication
     {
-
         App();
 
         void Initialize();
@@ -41,5 +41,6 @@ namespace TerminalApp
         event Windows.Foundation.TypedEventHandler<Object, String> TitleChanged;
         event Windows.Foundation.TypedEventHandler<Object, LastTabClosedEventArgs> LastTabClosed;
         event Windows.Foundation.TypedEventHandler<App, Windows.UI.Xaml.ElementTheme> RequestedThemeChanged;
+        event Windows.Foundation.TypedEventHandler<Object, ToggleFullscreenEventArgs> ToggleFullscreen;
     }
 }

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -198,4 +198,12 @@ namespace winrt::TerminalApp::implementation
             args.Handled(true);
         }
     }
+
+    void TerminalPage::_HandleToggleFullscreen(const IInspectable& /*sender*/,
+                                               const TerminalApp::ActionEventArgs& args)
+    {
+        _ToggleFullscreen();
+        args.Handled(true);
+    }
+
 }

src/cascadia/TerminalApp/AppKeyBindings.cpp

@@ -404,6 +404,12 @@ namespace winrt::TerminalApp::implementation
             _AdjustFontSizeHandlers(*this, *eventArgs);
             return eventArgs->Handled();
         }
+        case ShortcutAction::ToggleFullscreen:
+        {
+            auto eventArgs = winrt::make_self<ActionEventArgs>();
+            _ToggleFullscreenHandlers(*this, *eventArgs);
+            return eventArgs->Handled();
+        }
         default:
             return false;
         }

src/cascadia/TerminalApp/AppKeyBindings.h

@@ -75,6 +75,7 @@ namespace winrt::TerminalApp::implementation
         TYPED_EVENT(OpenSettings,      TerminalApp::AppKeyBindings, TerminalApp::ActionEventArgs);
         TYPED_EVENT(ResizePane,        TerminalApp::AppKeyBindings, TerminalApp::ActionEventArgs);
         TYPED_EVENT(MoveFocus,         TerminalApp::AppKeyBindings, TerminalApp::ActionEventArgs);
+        TYPED_EVENT(ToggleFullscreen,  TerminalApp::AppKeyBindings, TerminalApp::ActionEventArgs);
         // clang-format on
 
     private:

src/cascadia/TerminalApp/AppKeyBindings.idl

@@ -53,6 +53,7 @@ namespace TerminalApp
         MoveFocusRight,
         MoveFocusUp,
         MoveFocusDown,
+        ToggleFullscreen,
         OpenSettings
     };
 
@@ -87,5 +88,6 @@ namespace TerminalApp
         event Windows.Foundation.TypedEventHandler<AppKeyBindings, ActionEventArgs> OpenSettings;
         event Windows.Foundation.TypedEventHandler<AppKeyBindings, ActionEventArgs> ResizePane;
         event Windows.Foundation.TypedEventHandler<AppKeyBindings, ActionEventArgs> MoveFocus;
+        event Windows.Foundation.TypedEventHandler<AppKeyBindings, ActionEventArgs> ToggleFullscreen;
     }
 }

src/cascadia/TerminalApp/AppKeyBindingsSerialization.cpp

@@ -70,6 +70,7 @@ static constexpr std::string_view MoveFocusLeftKey{ "moveFocusLeft" };
 static constexpr std::string_view MoveFocusRightKey{ "moveFocusRight" };
 static constexpr std::string_view MoveFocusUpKey{ "moveFocusUp" };
 static constexpr std::string_view MoveFocusDownKey{ "moveFocusDown" };
+static constexpr std::string_view ToggleFullscreenKey{ "toggleFullscreen" };
 
 // Specifically use a map here over an unordered_map. We want to be able to
 // iterate over these entries in-order when we're serializing the keybindings.
@@ -127,6 +128,7 @@ static const std::map<std::string_view, ShortcutAction, std::less<>> commandName
     { MoveFocusUpKey, ShortcutAction::MoveFocusUp },
     { MoveFocusDownKey, ShortcutAction::MoveFocusDown },
     { OpenSettingsKey, ShortcutAction::OpenSettings },
+    { ToggleFullscreenKey, ShortcutAction::ToggleFullscreen },
     { UnboundKey, ShortcutAction::Invalid },
 };
 

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -559,6 +559,7 @@ namespace winrt::TerminalApp::implementation
         bindings.MoveFocus({ this, &TerminalPage::_HandleMoveFocus });
         bindings.CopyText({ this, &TerminalPage::_HandleCopyText });
         bindings.AdjustFontSize({ this, &TerminalPage::_HandleAdjustFontSize });
+        bindings.ToggleFullscreen({ this, &TerminalPage::_HandleToggleFullscreen });
     }
 
     // Method Description:
@@ -606,11 +607,13 @@ namespace winrt::TerminalApp::implementation
     // - Handle changes in tab layout.
     void TerminalPage::_UpdateTabView()
     {
+        // Never show the tab row when we're fullscreen. Otherwise:
         // Show tabs when there's more than 1, or the user has chosen to always
         // show the tab bar.
-        const bool isVisible = _settings->GlobalSettings().GetShowTabsInTitlebar() ||
-                               (_tabs.size() > 1) ||
-                               _settings->GlobalSettings().GetAlwaysShowTabs();
+        const bool isVisible = (!_isFullscreen) &&
+                               (_settings->GlobalSettings().GetShowTabsInTitlebar() ||
+                                (_tabs.size() > 1) ||
+                                _settings->GlobalSettings().GetAlwaysShowTabs());
 
         // collapse/show the tabs themselves
         _tabView.Visibility(isVisible ? Visibility::Visible : Visibility::Collapsed);
@@ -1323,11 +1326,28 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
+    // Method Description:
+    // - Toggles fullscreen mode. Hides the tab row, and raises our
+    //   ToggleFullscreen event.
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - <none>
+    void TerminalPage::_ToggleFullscreen()
+    {
+        _toggleFullscreenHandlers(*this, nullptr);
+
+        _isFullscreen = !_isFullscreen;
+
+        _UpdateTabView();
+    }
+
     // -------------------------------- WinRT Events ---------------------------------
     // Winrt events need a method for adding a callback to the event and removing the callback.
     // These macros will define them both for you.
     DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(TerminalPage, TitleChanged, _titleChangeHandlers, winrt::Windows::Foundation::IInspectable, winrt::hstring);
     DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(TerminalPage, LastTabClosed, _lastTabClosedHandlers, winrt::Windows::Foundation::IInspectable, winrt::TerminalApp::LastTabClosedEventArgs);
     DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(TerminalPage, SetTitleBarContent, _setTitleBarContentHandlers, winrt::Windows::Foundation::IInspectable, UIElement);
     DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(TerminalPage, ShowDialog, _showDialogHandlers, winrt::Windows::Foundation::IInspectable, WUX::Controls::ContentDialog);
+    DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(TerminalPage, ToggleFullscreen, _toggleFullscreenHandlers, winrt::Windows::Foundation::IInspectable, winrt::TerminalApp::ToggleFullscreenEventArgs);
 }

src/cascadia/TerminalApp/TerminalPage.h

@@ -40,6 +40,7 @@ namespace winrt::TerminalApp::implementation
         DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(LastTabClosed, _lastTabClosedHandlers, winrt::Windows::Foundation::IInspectable, winrt::TerminalApp::LastTabClosedEventArgs);
         DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(SetTitleBarContent, _setTitleBarContentHandlers, winrt::Windows::Foundation::IInspectable, winrt::Windows::UI::Xaml::UIElement);
         DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(ShowDialog, _showDialogHandlers, winrt::Windows::Foundation::IInspectable, winrt::Windows::UI::Xaml::Controls::ContentDialog);
+        DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(ToggleFullscreen, _toggleFullscreenHandlers, winrt::Windows::Foundation::IInspectable, winrt::TerminalApp::ToggleFullscreenEventArgs);
 
     private:
         // If you add controls here, but forget to null them either here or in
@@ -57,6 +58,8 @@ namespace winrt::TerminalApp::implementation
 
         std::vector<std::shared_ptr<Tab>> _tabs;
 
+        bool _isFullscreen{ false };
+
         void _ShowAboutDialog();
         void _ShowCloseWarningDialog();
 
@@ -120,6 +123,8 @@ namespace winrt::TerminalApp::implementation
 
         void _RefreshUIForSettingsReload();
 
+        void _ToggleFullscreen();
+
 #pragma region ActionHandlers
         // These are all defined in AppActionHandlers.cpp
         void _HandleNewTab(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
@@ -144,6 +149,7 @@ namespace winrt::TerminalApp::implementation
         void _HandleCopyText(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
         void _HandleCloseWindow(const IInspectable&, const TerminalApp::ActionEventArgs& args);
         void _HandleAdjustFontSize(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
+        void _HandleToggleFullscreen(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
 #pragma endregion
     };
 }

src/cascadia/TerminalApp/TerminalPage.idl

@@ -1,9 +1,11 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-import "..\App.idl";
 
 namespace TerminalApp
 {
+    delegate void LastTabClosedEventArgs();
+    delegate void ToggleFullscreenEventArgs();
+
     [default_interface] runtimeclass TerminalPage : Windows.UI.Xaml.Controls.Page
     {
         TerminalPage();
@@ -12,5 +14,6 @@ namespace TerminalApp
         event Windows.Foundation.TypedEventHandler<Object, LastTabClosedEventArgs> LastTabClosed;
         event Windows.Foundation.TypedEventHandler<Object, Windows.UI.Xaml.UIElement> SetTitleBarContent;
         event Windows.Foundation.TypedEventHandler<Object, Windows.UI.Xaml.Controls.ContentDialog> ShowDialog;
+        event Windows.Foundation.TypedEventHandler<Object, ToggleFullscreenEventArgs> ToggleFullscreen;
     }
 }

src/cascadia/TerminalApp/defaults.json

@@ -233,6 +233,8 @@
         { "command": "switchToTab7", "keys": ["ctrl+alt+8"] },
         { "command": "switchToTab8", "keys": ["ctrl+alt+9"] },
         { "command": "decreaseFontSize", "keys": ["ctrl+-"] },
-        { "command": "increaseFontSize", "keys": ["ctrl+="] }
+        { "command": "increaseFontSize", "keys": ["ctrl+="] },
+        { "command": "toggleFullscreen", "keys": ["alt+enter"] },
+        { "command": "toggleFullscreen", "keys": ["f11"] }
     ]
 }

src/cascadia/WindowsTerminal/AppHost.cpp

@@ -80,6 +80,7 @@ void AppHost::Initialize()
     _window->DragRegionClicked([this]() { _app.TitlebarClicked(); });
 
     _app.RequestedThemeChanged({ this, &AppHost::_UpdateTheme });
+    _app.ToggleFullscreen({ this, &AppHost::_ToggleFullscreen });
 
     _app.Create();
 
@@ -267,3 +268,9 @@ void AppHost::_UpdateTheme(const winrt::TerminalApp::App&, const winrt::Windows:
 {
     _window->OnApplicationThemeChanged(arg);
 }
+
+void AppHost::_ToggleFullscreen(const winrt::Windows::Foundation::IInspectable&,
+                                const winrt::TerminalApp::ToggleFullscreenEventArgs&)
+{
+    _window->ToggleFullscreen();
+}

src/cascadia/WindowsTerminal/AppHost.h

@@ -29,4 +29,6 @@ class AppHost
                                 const winrt::Windows::UI::Xaml::UIElement& arg);
     void _UpdateTheme(const winrt::TerminalApp::App&,
                       const winrt::Windows::UI::Xaml::ElementTheme& arg);
+    void _ToggleFullscreen(const winrt::Windows::Foundation::IInspectable& sender,
+                           const winrt::TerminalApp::ToggleFullscreenEventArgs& arg);
 };