Merge remote-tracking branch 'origin/main' into dev/lhecker/19977-kkp-altgr

.github/actions/spelling/expect/expect.txt

@@ -17,7 +17,6 @@ ADDSTRING
 ADDTOOL
 adml
 admx
-Affordance
 AFill
 AFX
 AHelper
@@ -30,6 +29,7 @@ allocing
 alpc
 ALTERNATENAME
 ALTF
+ALTGR
 ALTNUMPAD
 ALWAYSTIP
 ansicpg
@@ -77,6 +77,7 @@ autoscrolling
 Autowrap
 AVerify
 awch
+AZERTY
 azurecr
 backgrounded
 Backgrounder
@@ -242,7 +243,6 @@ consoletaeftemplates
 consoleuwp
 CONSOLEWINDOWOWNER
 consrv
-consteval
 constexprable
 contentfiles
 conterm
@@ -842,6 +842,8 @@ kinda
 KIYEOK
 KKP
 KLF
+klid
+KLLF
 KLMNO
 KOK
 KPRIORITY
@@ -1076,7 +1078,6 @@ NOCONTEXTHELP
 NOCOPYBITS
 nodiscard
 NODUP
-NODEFAULT
 noexcepts
 NOFONT
 NOHIDDENTEXT
@@ -1105,6 +1106,7 @@ NOSELECTION
 NOSENDCHANGING
 NOSIZE
 NOSNAPSHOT
+NOTELLSHELL
 NOTHOUSANDS
 NOTICKS
 NOTIMEOUTIFNOTHUNG
@@ -1562,7 +1564,6 @@ SMARTQUOTE
 SMTO
 snapcx
 snapcy
-SND
 snk
 SOLIDBOX
 Solutiondir

doc/cascadia/profiles.schema.json

@@ -60,8 +60,7 @@
             "enum": [
               "audible",
               "window",
-              "taskbar",
-              "notification"
+              "taskbar"
             ]
           }
         },
@@ -71,7 +70,6 @@
             "audible",
             "taskbar",
             "window",
-            "notification",
             "all",
             "none"
           ]
@@ -2472,13 +2470,6 @@
           },
           "type": "array"
         },
-        "safeUriSchemes": {
-          "description": "Specifies a list of URI schemes that are considered safe. No confirmation will be required to open URIs with these schemes.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
         "rendering.graphicsAPI": {
           "description": "Direct3D 11 provides a more performant and feature-rich experience, whereas Direct2D is more stable. The default option \"Automatic\" will pick the API that best fits your graphics hardware. If you experience significant issues, consider using Direct2D.",
           "type": "string",
@@ -2663,21 +2654,10 @@
           "type": "string"
         },
         "warning.confirmCloseAllTabs": {
-          "deprecated": true,
-          "description": "[Deprecated] Use \"warning.confirmOnClose\" instead.",
           "default": true,
+          "description": "When set to \"true\" closing a window with multiple tabs open will require confirmation.  When set to \"false\", the confirmation dialog will not appear.",
           "type": "boolean"
         },
-        "warning.confirmOnClose": {
-          "default": "automatic",
-          "description": "Controls when a confirmation dialog appears before closing tabs or windows.",
-          "enum": [
-            "never",
-            "automatic",
-            "always"
-          ],
-          "type": "string"
-        },
         "useTabSwitcher": {
           "description": "[Deprecated] Replaced with the \"tabSwitcherMode\" setting.",
           "default": true,

src/cascadia/CascadiaPackage/Package-Pre.appxmanifest

@@ -237,7 +237,6 @@
     <Capability Name="internetClient" />
     <rescap:Capability Name="runFullTrust" />
     <rescap:Capability Name="unvirtualizedResources" />
-    <rescap:Capability Name="appLicensing" />
   </Capabilities>
 
   <Extensions>

src/cascadia/CascadiaPackage/Package.appxmanifest

@@ -237,7 +237,6 @@
     <Capability Name="internetClient" />
     <rescap:Capability Name="runFullTrust" />
     <rescap:Capability Name="unvirtualizedResources" />
-    <rescap:Capability Name="appLicensing" />
   </Capabilities>
 
   <Extensions>

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -499,8 +499,8 @@ namespace winrt::TerminalApp::implementation
             }
             else
             {
-                const auto resizeSucceeded = _ResizePane(realArgs.ResizeDirection());
-                args.Handled(resizeSucceeded);
+                _ResizePane(realArgs.ResizeDirection());
+                args.Handled(true);
             }
         }
     }
@@ -801,7 +801,7 @@ namespace winrt::TerminalApp::implementation
 
             _RemoveTabs(tabsToRemove);
 
-            actionArgs.Handled(!tabsToRemove.empty());
+            actionArgs.Handled(true);
         }
     }
 
@@ -837,7 +837,7 @@ namespace winrt::TerminalApp::implementation
             // tab row, until you mouse over them. Probably has something to do
             // with tabs not resizing down until there's a mouse exit event.
 
-            actionArgs.Handled(!tabsToRemove.empty());
+            actionArgs.Handled(true);
         }
     }
 

src/cascadia/TerminalApp/AppCommandlineArgs.cpp

@@ -1068,15 +1068,6 @@ int AppCommandlineArgs::ParseArgs(winrt::array_view<const winrt::hstring> args)
         return 0;
     }
 
-    // When a toast notification is clicked, Windows may launch a new instance
-    // with "--from-toast" as the argument. This is a no-op sentinel — the
-    // in-process Activated handler on the toast already handled activation.
-    // See DesktopNotification.cpp for more details.
-    if (args.size() == 2 && args[1] == L"--from-toast")
-    {
-        return 0;
-    }
-
     auto commands = ::TerminalApp::AppCommandlineArgs::BuildCommands(args);
 
     for (auto& cmdBlob : commands)

src/cascadia/TerminalApp/BasicPaneEvents.h

@@ -15,7 +15,6 @@ namespace winrt::TerminalApp::implementation
         til::typed_event<IPaneContent> TaskbarProgressChanged;
         til::typed_event<IPaneContent> ReadOnlyChanged;
         til::typed_event<IPaneContent> FocusRequested;
-        til::typed_event<IPaneContent, winrt::TerminalApp::NotificationEventArgs> NotificationRequested;
 
         til::typed_event<winrt::Windows::Foundation::IInspectable, Microsoft::Terminal::Settings::Model::Command> DispatchCommandRequested;
     };

src/cascadia/TerminalApp/CommandPalette.xaml

@@ -344,7 +344,7 @@
                 <TextBlock x:Name="_parentCommandText"
                            Padding="16,4"
                            VerticalAlignment="Center"
-                           FontWeight="SemiBold"
+                           FontStyle="Italic"
                            Text="{x:Bind ParentCommandName, Mode=OneWay}" />
             </StackPanel>
 
@@ -358,8 +358,8 @@
 
                 <ScrollViewer MaxHeight="200"
                               VerticalScrollBarVisibility="Auto">
-                    <TextBlock Text="{x:Bind ParsedCommandLineText, Mode=OneWay}"
-                               TextAlignment="Left"
+                    <TextBlock FontStyle="Italic"
+                               Text="{x:Bind ParsedCommandLineText, Mode=OneWay}"
                                TextWrapping="Wrap" />
                 </ScrollViewer>
             </Border>
@@ -371,6 +371,7 @@
                     Visibility="Collapsed">
                 <TextBlock Padding="12,0"
                            VerticalAlignment="Center"
+                           FontStyle="Italic"
                            Text="{x:Bind NoMatchesText, Mode=OneWay}" />
             </Border>
 

src/cascadia/TerminalApp/DesktopNotification.cpp

@@ -1,129 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "DesktopNotification.h"
-
-#include <WtExeUtils.h>
-
-using namespace winrt::Windows::UI::Notifications;
-using namespace winrt::Windows::Data::Xml::Dom;
-
-namespace winrt::TerminalApp::implementation
-{
-    std::atomic<uint64_t> DesktopNotification::_lastNotificationTime{ 0 };
-
-    // Method Description:
-    // - Rate-limits toast notifications so we don't spam the user.
-    // Return Value:
-    // - Returns true if a notification is allowed, false if too recent.
-    bool DesktopNotification::ShouldSendNotification()
-    {
-        const auto now = GetTickCount64();
-        auto last = _lastNotificationTime.load(std::memory_order_relaxed);
-
-        // Subtraction wraps cleanly modulo 2^64, so the delta is correct even
-        // across the (~584 million year) GetTickCount64 rollover.
-        if (now - last < MinNotificationIntervalMs)
-        {
-            return false;
-        }
-
-        // Attempt to update; if another thread beat us, that's fine — we'll skip this one.
-        return _lastNotificationTime.compare_exchange_strong(last, now, std::memory_order_relaxed);
-    }
-
-    // Method Description:
-    // - Sends a toast notification with the given title and message.
-    // - When the user clicks the toast, the `Activated` callback fires
-    //   with the tabIndex that was passed in, so the caller can switch
-    //   to the correct tab and summon the window.
-    // Arguments:
-    // - args: The title, message, and tab index to include in the notification.
-    // - activated: A callback invoked on the background thread when the
-    //              toast is clicked. The uint32_t parameter is the tab index.
-    void DesktopNotification::SendNotification(const DesktopNotificationArgs& args, std::function<void()> activatedFunc)
-    {
-        try
-        {
-            if (!ShouldSendNotification())
-            {
-                return;
-            }
-
-            // Build the toast XML. We use a simple template with a title and body text.
-            //
-            // <toast launch="--from-toast">
-            //   <visual>
-            //     <binding template="ToastGeneric">
-            //       <text>Title</text>
-            //       <text>Message</text>
-            //     </binding>
-            //   </visual>
-            // </toast>
-            auto toastXml = ToastNotificationManager::GetTemplateContent(ToastTemplateType::ToastText02);
-            auto textNodes = toastXml.GetElementsByTagName(L"text");
-
-            // First <text> is the title
-            textNodes.Item(0).InnerText(args.Title);
-            // Second <text> is the body
-            textNodes.Item(1).InnerText(args.Message);
-
-            auto toastElement = toastXml.DocumentElement();
-
-            // When a toast is clicked, Windows launches a new instance of the app
-            // with the "launch" attribute as command-line arguments. We handle
-            // toast activation in-process via the Activated event below, so the
-            // new instance should do nothing. "--from-toast" is recognized by
-            // AppCommandlineArgs::ParseArgs as a no-op sentinel.
-            toastElement.SetAttribute(L"launch", L"--from-toast");
-
-            toastElement.SetAttribute(L"scenario", L"default");
-
-            auto toast = ToastNotification{ toastXml };
-
-            // Set the tag and group to enable notification replacement.
-            // Repeated notifications with the same tag replace the previous one
-            // rather than stacking in the notification center.
-            toast.Tag(args.Tag);
-            toast.Group(L"WindowsTerminal");
-
-            // When the user activates (clicks) the toast, fire the callback.
-            if (activatedFunc)
-            {
-                toast.Activated([activatedFunc](const auto& /*sender*/, const auto& /*eventArgs*/) {
-                    activatedFunc();
-                });
-            }
-
-            // For packaged apps, CreateToastNotifier() uses the package identity automatically.
-            // For unpackaged apps, we must pass the explicit AUMID that was registered
-            // at startup via SetCurrentProcessExplicitAppUserModelID.
-            winrt::Windows::UI::Notifications::ToastNotifier notifier{ nullptr };
-            if (IsPackaged())
-            {
-                notifier = ToastNotificationManager::CreateToastNotifier();
-            }
-            else
-            {
-                // Retrieve the AUMID that was set by WindowEmperor at startup.
-                wil::unique_cotaskmem_string aumid;
-                if (SUCCEEDED(GetCurrentProcessExplicitAppUserModelID(&aumid)))
-                {
-                    notifier = ToastNotificationManager::CreateToastNotifier(aumid.get());
-                }
-            }
-            if (notifier)
-            {
-                notifier.Show(toast);
-            }
-        }
-        catch (...)
-        {
-            // Toast notification is a best-effort feature. If it fails (e.g., notifications
-            // are disabled, or the app is unpackaged without proper AUMID setup), we silently
-            // ignore the error.
-            LOG_CAUGHT_EXCEPTION();
-        }
-    }
-}

src/cascadia/TerminalApp/DesktopNotification.h

@@ -1,37 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
-
-Module Name:
-- DesktopNotification.h
-
-Module Description:
-- Helper for sending Windows desktop toast notifications. Used to surface
-  terminal activity events to the user via the Windows notification center.
---*/
-
-#pragma once
-#include "pch.h"
-
-namespace winrt::TerminalApp::implementation
-{
-    struct DesktopNotificationArgs
-    {
-        winrt::hstring Title;
-        winrt::hstring Message;
-        winrt::hstring Tag;
-    };
-
-    class DesktopNotification
-    {
-    public:
-        static bool ShouldSendNotification();
-        static void SendNotification(const DesktopNotificationArgs& args, std::function<void()> activatedFunc);
-
-    private:
-        static std::atomic<uint64_t> _lastNotificationTime;
-
-        // Minimum interval between notifications, in milliseconds (GetTickCount64 units).
-        static constexpr uint64_t MinNotificationIntervalMs = 5'000;
-    };
-}

src/cascadia/TerminalApp/HighlightedTextControl.cpp

@@ -152,8 +152,8 @@ namespace winrt::TerminalApp::implementation
                     }
                     else
                     {
-                        // Default style: semibold
-                        run.FontWeight(FontWeights::SemiBold());
+                        // Default style: bold
+                        run.FontWeight(FontWeights::Bold());
                     }
                     inlinesCollection.Append(run);
 

src/cascadia/TerminalApp/IPaneContent.idl

@@ -14,13 +14,6 @@ namespace TerminalApp
     runtimeclass BellEventArgs
     {
         Boolean FlashTaskbar { get; };
-        Boolean SendNotification { get; };
-    };
-
-    runtimeclass NotificationEventArgs
-    {
-        String Title { get; };
-        String Body { get; };
     };
 
     interface IPaneContent
@@ -53,7 +46,6 @@ namespace TerminalApp
         event Windows.Foundation.TypedEventHandler<IPaneContent, Object> TaskbarProgressChanged;
         event Windows.Foundation.TypedEventHandler<IPaneContent, Object> ReadOnlyChanged;
         event Windows.Foundation.TypedEventHandler<IPaneContent, Object> FocusRequested;
-        event Windows.Foundation.TypedEventHandler<IPaneContent, NotificationEventArgs> NotificationRequested;
     };
 
 

src/cascadia/TerminalApp/Resources/de-DE/Resources.resw

@@ -499,48 +499,24 @@
     <value>Hinweise von Drittanbietern</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
     <value>Abbrechen</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Alle schließen</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
     <value>Möchten Sie alle Fenster schließen?</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>Abbrechen</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
     <value>Alle schließen</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
+  <data name="CloseAllDialog.Title" xml:space="preserve">
     <value>Möchten Sie alle Registerkarten schließen?</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>Alle schließen</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>Möchten Sie diese Registerkarte schließen?</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>Registerkarte schließen</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>Möchten Sie diesen Bereich schließen?</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>Bereich schließen</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>Möchten Sie diese Registerkarten schließen?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>Registerkarten schließen</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>Möchten Sie diese Bereiche schließen?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>Bereiche schließen</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>Nicht mehr fragen</value>
-  </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>Abbrechen</value>
   </data>
@@ -772,14 +748,6 @@
     <value>Windows</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>Aktivität auf der Registerkarte „{0}“</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>Aktivität auf der Registerkarte „{0}“ (Fenster „{1}“)</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>Eine neue Registerkarte im angegebenen Startverzeichnis öffnen</value>
   </data>
@@ -916,10 +884,10 @@
     <value>Wenn diese Option festgelegt ist, wird der Befehl an den Standardbefehl des Profils angefügt, anstatt ihn zu ersetzen.</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>Sitzung neu starten</value>
+    <value>Verbindung neu starten</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>Sitzung im aktiven Bereich neu starten</value>
+    <value>Verbindung mit aktivem Bereich neu starten</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>Schnipsel</value>

src/cascadia/TerminalApp/Resources/en-US/Resources.resw

@@ -443,13 +443,13 @@
     <value>Open a new tab</value>
   </data>
   <data name="NewPaneRun.Text" xml:space="preserve">
-    <value>Alt + Click to split the current window</value>
+    <value>Alt+Click to split the current window</value>
   </data>
   <data name="NewWindowRun.Text" xml:space="preserve">
-    <value>Shift + Click to open a new window</value>
+    <value>Shift+Click to open a new window</value>
   </data>
   <data name="ElevatedRun.Text" xml:space="preserve">
-    <value>Ctrl + Click to open as administrator</value>
+    <value>Ctrl+Click to open as administrator</value>
   </data>
   <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Close</value>
@@ -496,48 +496,24 @@
     <value>Third-Party notices</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
     <value>Cancel</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Close all</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
     <value>Do you want to close all windows?</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
     <value>Close all</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
+  <data name="CloseAllDialog.Title" xml:space="preserve">
     <value>Do you want to close all tabs?</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>Close all</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>Do you want to close this tab?</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>Close tab</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>Do you want to close this pane?</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>Close pane</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>Do you want to close these tabs?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>Close tabs</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>Do you want to close these panes?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>Close panes</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>Don't ask me again</value>
-  </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>Cancel</value>
   </data>
@@ -769,14 +745,6 @@
     <value>Windows</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>Activity in tab "{0}"</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>Activity in tab "{0}" (window "{1}")</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>Open a new tab in given starting directory</value>
   </data>
@@ -913,10 +881,10 @@
     <value>If set, the command will be appended to the profile's default command instead of replacing it.</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>Restart session</value>
+    <value>Restart connection</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>Restart the session in the active pane</value>
+    <value>Restart the active pane connection</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>Snippets</value>

src/cascadia/TerminalApp/Resources/es-ES/Resources.resw

@@ -496,48 +496,24 @@
     <value>Avisos de terceros</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
     <value>Cancelar</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Cerrar todo</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
     <value>¿Quiere cerrar todas las ventanas?</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>Cancelar</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
     <value>Cerrar todo</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
+  <data name="CloseAllDialog.Title" xml:space="preserve">
     <value>¿Quieres cerrar todas las pestañas?</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>Cerrar todo</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>¿Desea cerrar esta pestaña?</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>Cerrar pestaña</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>¿Desea cerrar este panel?</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>Cerrar panel</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>¿Desea cerrar estas pestañas?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>Cerrar pestañas</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>¿Desea cerrar estos paneles?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>Cerrar paneles</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>No volver a preguntarme</value>
-  </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>Cancelar</value>
   </data>
@@ -769,14 +745,6 @@
     <value>Windows</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>Actividad en la pestaña "{0}"</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>Actividad en la pestaña "{0}" (ventana "{1}")</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>Abrir una nueva pestaña en un directorio de inicio determinado</value>
   </data>
@@ -913,10 +881,10 @@
     <value>Si se establece, el comando se anexará al comando predeterminado del perfil en lugar de reemplazarlo.</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>Reiniciar sesión</value>
+    <value>Reiniciar conexión</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>Reiniciar la sesión en el panel activo</value>
+    <value>Reiniciar la conexión del panel activo</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>Fragmentos</value>

src/cascadia/TerminalApp/Resources/fr-FR/Resources.resw

@@ -496,48 +496,24 @@
     <value>Mentions tierces</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
     <value>Annuler</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Fermer tout</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
     <value>Voulez-vous fermer toutes les fenêtres ?</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>Annuler</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
     <value>Fermer tout</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
+  <data name="CloseAllDialog.Title" xml:space="preserve">
     <value>Voulez-vous fermer tous les onglets ?</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>Fermer tout</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>Voulez-vous fermer cet onglet ?</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>Fermer l'onglet</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>Voulez-vous fermer ce volet ?</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>Fermer le volet</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>Voulez-vous fermer ces onglets ?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>Fermer les onglets</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>Voulez-vous fermer ces volets ?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>Fermer les panneaux</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>Ne plus me le demander</value>
-  </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>Annuler</value>
   </data>
@@ -769,14 +745,6 @@
     <value>Windows</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>Activité sous l’onglet « {0} »</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>Activité sous l’onglet « {0} » (fenêtre « {1} »)</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>Ouvrez un nouvel onglet dans le répertoire correspondant</value>
   </data>
@@ -913,10 +881,10 @@
     <value>Si elle est définie, la commande sera ajoutée à la commande par défaut du profil au lieu de la remplacer.</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>Redémarrer la session</value>
+    <value>Redémarrer la connexion</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>Redémarrez la session dans le volet actif</value>
+    <value>Redémarrer la connexion du volet actif</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>Extraits</value>

src/cascadia/TerminalApp/Resources/it-IT/Resources.resw

@@ -496,48 +496,24 @@
     <value>Comunicazioni di terze parti</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
     <value>Annulla</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Chiudi tutto</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
     <value>Vuoi chiudere tutte le finestre?</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>Annulla</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
     <value>Chiudi tutto</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
+  <data name="CloseAllDialog.Title" xml:space="preserve">
     <value>Vuoi chiudere tutte le schede?</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>Chiudi tutto</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>Vuoi chiudere questa scheda?</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>Chiudi scheda</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>Vuoi chiudere questo riquadro?</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>Chiudi riquadro</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>Vuoi chiudere queste schede?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>Chiudi schede</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>Vuoi chiudere questi riquadri?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>Chiudi riquadri</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>Non chiedermelo più</value>
-  </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>Annulla</value>
   </data>
@@ -769,14 +745,6 @@
     <value>Windows</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>Attività nella scheda "{0}"</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>Attività nella scheda "{0}" (finestra "{1}")</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>Apri una nuova scheda nella directory di avvio specificata</value>
   </data>
@@ -913,10 +881,10 @@
     <value>Se impostato, il comando verrà aggiunto al comando predefinito del profilo invece di sostituirlo.</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>Riavvia la sessione</value>
+    <value>Riavvia connessione</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>Riavvia la sessione nel riquadro attivo</value>
+    <value>Riavvia la connessione al riquadro attivo</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>Frammenti</value>

src/cascadia/TerminalApp/Resources/ja-JP/Resources.resw

@@ -497,48 +497,24 @@
     <value>サード パーティ通知</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
     <value>キャンセル</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>すべて閉じる</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
     <value>すべてのウィンドウを閉じますか?</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>キャンセル</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
     <value>すべて閉じる</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
+  <data name="CloseAllDialog.Title" xml:space="preserve">
     <value>すべてのタブを閉じますか?</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>すべて閉じる</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>このタブを閉じますか?</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>タブを閉じる</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>このウィンドウを閉じますか?</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>ウィンドウを閉じる</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>これらのタブを閉じますか?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>タブを閉じる</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>これらのウィンドウを閉じますか?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>ウィンドウを閉じる</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>今後、このメッセージを表示しない</value>
-  </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>キャンセル</value>
   </data>
@@ -770,14 +746,6 @@
     <value>Windows</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>タブ "{0}" のアクティビティ</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>タブ "{0}" のアクティビティ (ウィンドウ "{1}")</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>指定された開始ディレクトリで新しいタブを開きます</value>
   </data>
@@ -914,10 +882,10 @@
     <value>設定されている場合、コマンドはプロファイルの既定のコマンドを置き換えるのではなく、追加されます。</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>セッションの再開</value>
+    <value>接続の再起動</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>アクティブなウィンドウでセッションを再起動します</value>
+    <value>アクティブ ペイン接続を再起動します</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>抜粋</value>

src/cascadia/TerminalApp/Resources/ko-KR/Resources.resw

@@ -496,48 +496,24 @@
     <value>타사 통지</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
     <value>취소</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>모두 닫기</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
     <value>모든 창을 닫으시겠습니까?</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>취소</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
     <value>모두 닫기</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
+  <data name="CloseAllDialog.Title" xml:space="preserve">
     <value>모든 탭을 닫으시겠습니까?</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>모두 닫기</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>이 탭을 닫으시겠습니까?</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>탭 닫기</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>이 창을 닫으시겠습니까?</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>창 닫기</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>이러한 탭을 닫으시겠습니까?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>탭 닫기</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>이 창을 닫으시겠습니까?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>창 닫기</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>다시 묻지 않기</value>
-  </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>취소</value>
   </data>
@@ -769,14 +745,6 @@
     <value>Windows</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>"{0}" 탭의 활동</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>"{0}" 탭의 활동(창 "{1}")</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>지정된 시작 디렉터리에서 새 탭 열기</value>
   </data>
@@ -913,10 +881,10 @@
     <value>설정하면 이 명령은 프로필의 기본 명령 대신 프로필의 기본 명령에 추가됩니다.</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>세션 다시 시작</value>
+    <value>연결 다시 시작</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>활성 창에서 세션을 다시 시작하세요.</value>
+    <value>활성 창 연결 다시 시작</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>짧은 요약</value>

src/cascadia/TerminalApp/Resources/pt-BR/Resources.resw

@@ -496,48 +496,24 @@
     <value>Avisos de Terceiros</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
     <value>Cancelar</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Fechar tudo</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
     <value>Deseja fechar todas as janelas?</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>Cancelar</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
     <value>Fechar tudo</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
+  <data name="CloseAllDialog.Title" xml:space="preserve">
     <value>Deseja fechar todas as guias?</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>Fechar tudo</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>Deseja fechar esta guia?</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>Fechar guia</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>Deseja fechar este painel?</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>Fechar painel</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>Deseja fechar estas guias?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>Fechar guias</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>Deseja fechar estes painéis?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>Fechar painéis</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>Não me pergunte novamente</value>
-  </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>Cancelar</value>
   </data>
@@ -769,14 +745,6 @@
     <value>Windows</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>Atividade na aba "{0}"</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>Atividade na aba "{0}" (janela "{1}")</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>Abrir uma nova guia no diretório inicial fornecido</value>
   </data>
@@ -913,10 +881,10 @@
     <value>Se definido, o comando será acrescentado ao comando padrão do perfil em vez de substituí-lo.</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>Reiniciar sessão</value>
+    <value>Reiniciar conexão</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>Reinicie a sessão no painel ativo</value>
+    <value>Reiniciar a conexão do painel ativo</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>Trechos</value>

src/cascadia/TerminalApp/Resources/qps-ploc/Resources.resw

@@ -496,47 +496,23 @@
     <value>Ţћĩřð-Ρářŧγ ñοŧīĉęŝ !!! !!!</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
-    <value>Ĉάйçэļ !</value>
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
+    <value>Ċдйĉέł !</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
-    <value>Ďő убυ ẅåήт ţø ¢ľöѕē äľľ ẃιⁿðŏŵş? !!! !!! !!! </value>
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>€ļőşε áļľ !!!</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
-    <value>Ċľóѕε ªĺĺ !!!</value>
+  <data name="QuitDialog.Title" xml:space="preserve">
+    <value>Ďõ γбű ẁāŋţ ťó ςℓσśĕ äℓℓ шîйđбẁś? !!! !!! !!! </value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
-    <value>Ďō γőű шдπŧ ŧò ςłοѕз āĺℓ ţäьš? !!! !!! !!!</value>
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>Ćăʼnċęℓ !</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>Ĉŀõśê āłĺ !!!</value>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Ćļõѕέ аłℓ !!!</value>
   </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>Đó уøυ ẅāńť тο çŀǿśę ŧĥíš τάъ? !!! !!! !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>Ċℓοѕē ţαъ !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>Đò γθũ ώăńт ťǿ ¢ℓσŝę ŧħîŝ ρаńе? !!! !!! !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>Ĉŀбśз φдŋё !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>Đó ўоú ŵąňτ ŧò çŀσѕė ŧћěśé ţдьş? !!! !!! !!! </value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>Ćŀöśé ŧãвś !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>Ðǿ ỳбū ŵáήť ŧо ćļόśě τнέšê φăñєš? !!! !!! !!! </value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>€łǿśē рāⁿęѕ !!!</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>Đòñ'ť ªѕķ мë àĝáîⁿ !!! !!</value>
+  <data name="CloseAllDialog.Title" xml:space="preserve">
+    <value>Đσ ŷőū шдиŧ тò čļòŝз αŀľ ţâвŝ? !!! !!! !!!</value>
   </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>Čǻñčėŀ !</value>
@@ -769,14 +745,6 @@
     <value>Ẃϊйδοŵš !!</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>Δćţíνïŧý īй τаь "{0}" !!! !!!</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>Δсŧìνιŧý įņ ţªь "{0}" (ŵϊņδόώ "{1}") !!! !!! !!! !</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>Фφĕń ª пёẅ ţâь ίи ğīνęņ ѕŧāятĩлğ δįŗęćтŏяγ !!! !!! !!! !!! </value>
   </data>
@@ -913,10 +881,10 @@
     <value>Ĩƒ šęţ, ŧнĕ ¢ömmдлδ ŵîĺł ьέ åφрєйδĕđ τσ ŧђė рřŏƒїłє'ş đзƒªūľţ ¢οmмăńδ іñѕţέáđ øƒ ѓēρļąċĭлĝ їţ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>Γēѕŧâяŧ ŝєѕѕïσⁿ !!! !</value>
+    <value>Γēѕŧâяŧ ćǿńńēčťїöл !!! !!</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>Γėşťáгţ ŧħ℮ ŝёšŝīőń įй τђ℮ ăċţΐνе φǻñē !!! !!! !!! !!</value>
+    <value>Γėşťáгţ ŧħ℮ ãčтĩνέ ρăйё сǿηńëςтιóņ !!! !!! !!! !</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>Šņíрρēťş !!</value>

src/cascadia/TerminalApp/Resources/qps-ploca/Resources.resw

@@ -496,47 +496,23 @@
     <value>Ţћĩřð-Ρářŧγ ñοŧīĉęŝ !!! !!!</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
-    <value>Ĉάйçэļ !</value>
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
+    <value>Ċдйĉέł !</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
-    <value>Ďő убυ ẅåήт ţø ¢ľöѕē äľľ ẃιⁿðŏŵş? !!! !!! !!! </value>
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>€ļőşε áļľ !!!</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
-    <value>Ċľóѕε ªĺĺ !!!</value>
+  <data name="QuitDialog.Title" xml:space="preserve">
+    <value>Ďõ γбű ẁāŋţ ťó ςℓσśĕ äℓℓ шîйđбẁś? !!! !!! !!! </value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
-    <value>Ďō γőű шдπŧ ŧò ςłοѕз āĺℓ ţäьš? !!! !!! !!!</value>
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>Ćăʼnċęℓ !</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>Ĉŀõśê āłĺ !!!</value>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Ćļõѕέ аłℓ !!!</value>
   </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>Đó уøυ ẅāńť тο çŀǿśę ŧĥíš τάъ? !!! !!! !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>Ċℓοѕē ţαъ !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>Đò γθũ ώăńт ťǿ ¢ℓσŝę ŧħîŝ ρаńе? !!! !!! !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>Ĉŀбśз φдŋё !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>Đó ўоú ŵąňτ ŧò çŀσѕė ŧћěśé ţдьş? !!! !!! !!! </value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>Ćŀöśé ŧãвś !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>Ðǿ ỳбū ŵáήť ŧо ćļόśě τнέšê φăñєš? !!! !!! !!! </value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>€łǿśē рāⁿęѕ !!!</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>Đòñ'ť ªѕķ мë àĝáîⁿ !!! !!</value>
+  <data name="CloseAllDialog.Title" xml:space="preserve">
+    <value>Đσ ŷőū шдиŧ тò čļòŝз αŀľ ţâвŝ? !!! !!! !!!</value>
   </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>Čǻñčėŀ !</value>
@@ -769,14 +745,6 @@
     <value>Ẃϊйδοŵš !!</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>Δćţíνïŧý īй τаь "{0}" !!! !!!</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>Δсŧìνιŧý įņ ţªь "{0}" (ŵϊņδόώ "{1}") !!! !!! !!! !</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>Фφĕń ª пёẅ ţâь ίи ğīνęņ ѕŧāятĩлğ δįŗęćтŏяγ !!! !!! !!! !!! </value>
   </data>
@@ -913,10 +881,10 @@
     <value>Ĩƒ šęţ, ŧнĕ ¢ömmдлδ ŵîĺł ьέ åφрєйδĕđ τσ ŧђė рřŏƒїłє'ş đзƒªūľţ ¢οmмăńδ іñѕţέáđ øƒ ѓēρļąċĭлĝ їţ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>Γēѕŧâяŧ ŝєѕѕïσⁿ !!! !</value>
+    <value>Γēѕŧâяŧ ćǿńńēčťїöл !!! !!</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>Γėşťáгţ ŧħ℮ ŝёšŝīőń įй τђ℮ ăċţΐνе φǻñē !!! !!! !!! !!</value>
+    <value>Γėşťáгţ ŧħ℮ ãčтĩνέ ρăйё сǿηńëςтιóņ !!! !!! !!! !</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>Šņíрρēťş !!</value>

src/cascadia/TerminalApp/Resources/qps-plocm/Resources.resw

@@ -496,47 +496,23 @@
     <value>Ţћĩřð-Ρářŧγ ñοŧīĉęŝ !!! !!!</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
-    <value>Ĉάйçэļ !</value>
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
+    <value>Ċдйĉέł !</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
-    <value>Ďő убυ ẅåήт ţø ¢ľöѕē äľľ ẃιⁿðŏŵş? !!! !!! !!! </value>
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>€ļőşε áļľ !!!</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
-    <value>Ċľóѕε ªĺĺ !!!</value>
+  <data name="QuitDialog.Title" xml:space="preserve">
+    <value>Ďõ γбű ẁāŋţ ťó ςℓσśĕ äℓℓ шîйđбẁś? !!! !!! !!! </value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
-    <value>Ďō γőű шдπŧ ŧò ςłοѕз āĺℓ ţäьš? !!! !!! !!!</value>
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>Ćăʼnċęℓ !</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>Ĉŀõśê āłĺ !!!</value>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Ćļõѕέ аłℓ !!!</value>
   </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>Đó уøυ ẅāńť тο çŀǿśę ŧĥíš τάъ? !!! !!! !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>Ċℓοѕē ţαъ !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>Đò γθũ ώăńт ťǿ ¢ℓσŝę ŧħîŝ ρаńе? !!! !!! !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>Ĉŀбśз φдŋё !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>Đó ўоú ŵąňτ ŧò çŀσѕė ŧћěśé ţдьş? !!! !!! !!! </value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>Ćŀöśé ŧãвś !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>Ðǿ ỳбū ŵáήť ŧо ćļόśě τнέšê φăñєš? !!! !!! !!! </value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>€łǿśē рāⁿęѕ !!!</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>Đòñ'ť ªѕķ мë àĝáîⁿ !!! !!</value>
+  <data name="CloseAllDialog.Title" xml:space="preserve">
+    <value>Đσ ŷőū шдиŧ тò čļòŝз αŀľ ţâвŝ? !!! !!! !!!</value>
   </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>Čǻñčėŀ !</value>
@@ -769,14 +745,6 @@
     <value>Ẃϊйδοŵš !!</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>Δćţíνïŧý īй τаь "{0}" !!! !!!</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>Δсŧìνιŧý įņ ţªь "{0}" (ŵϊņδόώ "{1}") !!! !!! !!! !</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>Фφĕń ª пёẅ ţâь ίи ğīνęņ ѕŧāятĩлğ δįŗęćтŏяγ !!! !!! !!! !!! </value>
   </data>
@@ -913,10 +881,10 @@
     <value>Ĩƒ šęţ, ŧнĕ ¢ömmдлδ ŵîĺł ьέ åφрєйδĕđ τσ ŧђė рřŏƒїłє'ş đзƒªūľţ ¢οmмăńδ іñѕţέáđ øƒ ѓēρļąċĭлĝ їţ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>Γēѕŧâяŧ ŝєѕѕïσⁿ !!! !</value>
+    <value>Γēѕŧâяŧ ćǿńńēčťїöл !!! !!</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>Γėşťáгţ ŧħ℮ ŝёšŝīőń įй τђ℮ ăċţΐνе φǻñē !!! !!! !!! !!</value>
+    <value>Γėşťáгţ ŧħ℮ ãčтĩνέ ρăйё сǿηńëςтιóņ !!! !!! !!! !</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>Šņíрρēťş !!</value>

src/cascadia/TerminalApp/Resources/ru-RU/Resources.resw

@@ -496,48 +496,24 @@
     <value>Уведомления третьих лиц</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
     <value>Отмена</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Закрыть все</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
     <value>Закрыть все окна?</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>Отмена</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
     <value>Закрыть все</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
+  <data name="CloseAllDialog.Title" xml:space="preserve">
     <value>Закрыть все вкладки?</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>Закрыть все</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>Закрыть эту вкладку?</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>Закрыть вкладку</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>Закрыть эту панель?</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>Закрыть область</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>Закрыть эти вкладки?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>Закрыть вкладки</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>Закрыть эти панели?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>Закрыть панели</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>Больше не спрашивать</value>
-  </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>Отмена</value>
   </data>
@@ -769,14 +745,6 @@
     <value>Windows</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>Активность на вкладке "{0}"</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>Активность на вкладке "{0}" (окно "{1}")</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>Открыть новую вкладку в указанном начальном каталоге</value>
   </data>
@@ -913,10 +881,10 @@
     <value>Если этот параметр настроен, команда будет добавлена к стандартной команде профиля, а не заменит ее.</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>Перезапустить сеанс</value>
+    <value>Перезапустить подключение</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>Перезапустите сеанс в активной панели</value>
+    <value>Перезапустить соединение с активной панелью.</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>Фрагменты</value>

src/cascadia/TerminalApp/Resources/zh-CN/Resources.resw

@@ -496,48 +496,24 @@
     <value>第三方通知</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
     <value>取消</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>全部关闭</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
     <value>是否要关闭所有窗口?</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>取消</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
     <value>全部关闭</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
+  <data name="CloseAllDialog.Title" xml:space="preserve">
     <value>是否要关闭所有标签页?</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>全部关闭</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>是否要关闭此选项卡?</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>关闭选项卡</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>是否要关闭此窗格?</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>关闭窗格</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>是否要关闭这些选项卡?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>关闭选项卡</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>是否要关闭这些窗格?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>关闭窗格</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>不再询问</value>
-  </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>取消</value>
   </data>
@@ -769,14 +745,6 @@
     <value>Windows</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>选项卡“{0}”中的活动</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>选项卡“{0}”(窗口“{1}”)中的活动</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>在给定的起始目录中打开新选项卡</value>
   </data>
@@ -913,10 +881,10 @@
     <value>如果设置，该命令将追加到配置文件的默认命令，而不是替换它。</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>重启会话</value>
+    <value>重新启动连接</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>重启活动窗格中的会话</value>
+    <value>重新启动活动窗格连接</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>片段</value>

src/cascadia/TerminalApp/Resources/zh-TW/Resources.resw

@@ -496,48 +496,24 @@
     <value>第三方注意事項</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
     <value>取消</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>全部關閉</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
     <value>您要關閉所有視窗嗎?</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>取消</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
     <value>全部關閉</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
+  <data name="CloseAllDialog.Title" xml:space="preserve">
     <value>您要關閉所有索引標籤嗎?</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>全部關閉</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>是否要關閉此索引標籤?</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>關閉索引標籤</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>是否要關閉此窗格?</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>關閉窗格</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>是否要關閉這些索引標籤?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>關閉索引標籤</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>是否要關閉這些窗格?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>關閉窗格</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>不要再問我</value>
-  </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>取消</value>
   </data>
@@ -769,14 +745,6 @@
     <value>Windows</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>索引標籤「{0}」中的活動</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>索引標籤「{0}」(視窗「{1}」) 中的活動</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>開啟指定起始目錄中的新索引標籤</value>
   </data>
@@ -913,10 +881,10 @@
     <value>如果設定，命令會附加到設定檔的預設命令，而不是取代命令。</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>重新啟動工作模式</value>
+    <value>重新啟動連線</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>在使用中窗格重新啟動工作階段</value>
+    <value>重新啟動使用中的窗格連線</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>片斷</value>

src/cascadia/TerminalApp/SuggestionsControl.xaml

@@ -167,7 +167,7 @@
                 <TextBlock x:Name="_parentCommandText"
                            Padding="16,4"
                            VerticalAlignment="Center"
-                           FontWeight="SemiBold"
+                           FontStyle="Italic"
                            Text="{x:Bind ParentCommandName, Mode=OneWay}" />
             </StackPanel>
 
@@ -179,6 +179,7 @@
                     Visibility="Collapsed">
                 <TextBlock Padding="12,0"
                            VerticalAlignment="Center"
+                           FontStyle="Italic"
                            Text="{x:Bind NoMatchesText, Mode=OneWay}" />
             </Border>
 
@@ -227,7 +228,7 @@
                         Visibility="Collapsed">
                 <TextBlock x:Name="_descriptionTitle"
                            FontSize="14"
-                           FontWeight="SemiBold"
+                           FontWeight="Bold"
                            IsTextSelectionEnabled="True"
                            TextWrapping="WrapWholeWords">
                     <TextBlock.ContextFlyout>

src/cascadia/TerminalApp/Tab.cpp

@@ -35,6 +35,7 @@ namespace winrt::TerminalApp::implementation
         _activePane = nullptr;
 
         _closePaneMenuItem.Visibility(WUX::Visibility::Collapsed);
+        _restartConnectionMenuItem.Visibility(WUX::Visibility::Collapsed);
 
         auto firstId = _nextPaneId;
 
@@ -85,7 +86,6 @@ namespace winrt::TerminalApp::implementation
 
         _MakeTabViewItem();
         _CreateContextMenu();
-        _UpdateMenuItemStates();
 
         _headerControl.TabStatus(_tabStatus);
 
@@ -235,14 +235,14 @@ namespace winrt::TerminalApp::implementation
 
         auto textBlock = WUX::Controls::TextBlock{};
         textBlock.TextWrapping(WUX::TextWrapping::Wrap);
-        textBlock.TextAlignment(WUX::TextAlignment::Left);
+        textBlock.TextAlignment(WUX::TextAlignment::Center);
         textBlock.Inlines().Append(titleRun);
 
         if (!_keyChord.empty())
         {
             auto keyChordRun = WUX::Documents::Run();
             keyChordRun.Text(_keyChord);
-            textBlock.Inlines().Append(WUX::Documents::LineBreak{});
+            keyChordRun.FontStyle(winrt::Windows::UI::Text::FontStyle::Italic);
             textBlock.Inlines().Append(WUX::Documents::LineBreak{});
             textBlock.Inlines().Append(keyChordRun);
         }
@@ -844,14 +844,14 @@ namespace winrt::TerminalApp::implementation
     // Arguments:
     // - direction: The direction to move the separator in.
     // Return Value:
-    // - whether a pane was resized
-    bool Tab::ResizePane(const ResizeDirection& direction)
+    // - <none>
+    void Tab::ResizePane(const ResizeDirection& direction)
     {
         ASSERT_UI_THREAD();
 
         // NOTE: This _must_ be called on the root pane, so that it can propagate
         // throughout the entire tree.
-        return _rootPane->ResizePane(direction);
+        _rootPane->ResizePane(direction);
     }
 
     // Method Description:
@@ -1148,14 +1148,6 @@ namespace winrt::TerminalApp::implementation
                         tab->TabRaiseVisualBell.raise();
                     }
 
-                    // Send a desktop toast notification if requested, but only if
-                    // the pane isn't already in the belled state. This prevents
-                    // sending repeated toasts for repeated BEL characters.
-                    if (bellArgs.SendNotification() && !tab->_tabStatus.BellIndicator())
-                    {
-                        tab->TabToastNotificationRequested.raise(tab->Title(), L"", sender);
-                    }
-
                     // Show the bell indicator in the tab header
                     tab->ShowBellIndicator(true);
 
@@ -1174,18 +1166,6 @@ namespace winrt::TerminalApp::implementation
             events.RestartTerminalRequested = terminal.RestartTerminalRequested(winrt::auto_revoke, { get_weak(), &Tab::_bubbleRestartTerminalRequested });
         }
 
-        events.NotificationRequested = content.NotificationRequested(
-            winrt::auto_revoke,
-            [dispatcher, weakThis](TerminalApp::IPaneContent sender, auto notifArgs) -> safe_void_coroutine {
-                const auto weakThisCopy = weakThis;
-                co_await wil::resume_foreground(dispatcher);
-                if (const auto tab{ weakThisCopy.get() })
-                {
-                    const auto title = notifArgs.Title().empty() ? tab->Title() : notifArgs.Title();
-                    tab->TabToastNotificationRequested.raise(title, notifArgs.Body(), sender);
-                }
-            });
-
         if (_tabStatus.IsInputBroadcastActive())
         {
             if (const auto& termContent{ content.try_as<TerminalApp::TerminalPaneContent>() })
@@ -1274,7 +1254,7 @@ namespace winrt::TerminalApp::implementation
 
     // Method Description:
     // - Set an indicator on the tab if any pane is in a closed connection state.
-    // - Show/hide the Restart Session context menu entry depending on active pane's state.
+    // - Show/hide the Restart Connection context menu entry depending on active pane's state.
     // Arguments:
     // - <none>
     // Return Value:
@@ -1291,6 +1271,13 @@ namespace winrt::TerminalApp::implementation
 
             _tabStatus.IsConnectionClosed(isClosed);
         }
+
+        if (_activePane)
+        {
+            _restartConnectionMenuItem.Visibility(_activePane->IsConnectionClosed() ?
+                                                      WUX::Visibility::Visible :
+                                                      WUX::Visibility::Collapsed);
+        }
     }
 
     void Tab::_RestartActivePaneConnection()
@@ -1361,22 +1348,6 @@ namespace winrt::TerminalApp::implementation
                 }
             });
         }
-
-        _UpdateMenuItemStates();
-    }
-
-    void Tab::_UpdateMenuItemStates()
-    {
-        // Terminal-specific menu items
-        const auto content = _activePane ? _activePane->GetContent() : nullptr;
-        const auto isTerm = content && content.try_as<winrt::TerminalApp::TerminalPaneContent>() != nullptr;
-        _duplicateTabMenuItem.IsEnabled(isTerm);
-        _exportTabMenuItem.IsEnabled(isTerm);
-        _findMenuItem.IsEnabled(isTerm);
-        _restartConnectionMenuItem.IsEnabled(isTerm);
-
-        // Snippets Pane can technically be split
-        _splitTabMenuItem.IsEnabled(isTerm || (content && content.try_as<winrt::TerminalApp::SnippetsPaneContent>() != nullptr));
     }
 
     // Method Description:
@@ -1681,100 +1652,106 @@ namespace winrt::TerminalApp::implementation
             Automation::AutomationProperties::SetHelpText(renameTabMenuItem, renameTabToolTip);
         }
 
+        Controls::MenuFlyoutItem duplicateTabMenuItem;
         {
             // "Duplicate tab"
             Controls::FontIcon duplicateTabSymbol;
             duplicateTabSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
             duplicateTabSymbol.Glyph(L"\xF5ED");
 
-            _duplicateTabMenuItem.Click({ get_weak(), &Tab::_duplicateTabClicked });
-            _duplicateTabMenuItem.Text(RS_(L"DuplicateTabText"));
-            _duplicateTabMenuItem.Icon(duplicateTabSymbol);
+            duplicateTabMenuItem.Click({ get_weak(), &Tab::_duplicateTabClicked });
+            duplicateTabMenuItem.Text(RS_(L"DuplicateTabText"));
+            duplicateTabMenuItem.Icon(duplicateTabSymbol);
 
             const auto duplicateTabToolTip = RS_(L"DuplicateTabToolTip");
 
-            WUX::Controls::ToolTipService::SetToolTip(_duplicateTabMenuItem, box_value(duplicateTabToolTip));
-            Automation::AutomationProperties::SetHelpText(_duplicateTabMenuItem, duplicateTabToolTip);
+            WUX::Controls::ToolTipService::SetToolTip(duplicateTabMenuItem, box_value(duplicateTabToolTip));
+            Automation::AutomationProperties::SetHelpText(duplicateTabMenuItem, duplicateTabToolTip);
         }
 
+        Controls::MenuFlyoutItem splitTabMenuItem;
         {
             // "Split tab"
             Controls::FontIcon splitTabSymbol;
             splitTabSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
             splitTabSymbol.Glyph(L"\xF246"); // ViewDashboard
 
-            _splitTabMenuItem.Click({ get_weak(), &Tab::_splitTabClicked });
-            _splitTabMenuItem.Text(RS_(L"SplitTabText"));
-            _splitTabMenuItem.Icon(splitTabSymbol);
+            splitTabMenuItem.Click({ get_weak(), &Tab::_splitTabClicked });
+            splitTabMenuItem.Text(RS_(L"SplitTabText"));
+            splitTabMenuItem.Icon(splitTabSymbol);
 
             const auto splitTabToolTip = RS_(L"SplitTabToolTip");
 
-            WUX::Controls::ToolTipService::SetToolTip(_splitTabMenuItem, box_value(splitTabToolTip));
-            Automation::AutomationProperties::SetHelpText(_splitTabMenuItem, splitTabToolTip);
+            WUX::Controls::ToolTipService::SetToolTip(splitTabMenuItem, box_value(splitTabToolTip));
+            Automation::AutomationProperties::SetHelpText(splitTabMenuItem, splitTabToolTip);
         }
 
+        Controls::MenuFlyoutItem closePaneMenuItem = _closePaneMenuItem;
         {
             // "Close pane"
-            _closePaneMenuItem.Click({ get_weak(), &Tab::_closePaneClicked });
-            _closePaneMenuItem.Text(RS_(L"ClosePaneText"));
+            closePaneMenuItem.Click({ get_weak(), &Tab::_closePaneClicked });
+            closePaneMenuItem.Text(RS_(L"ClosePaneText"));
 
             const auto closePaneToolTip = RS_(L"ClosePaneToolTip");
 
-            WUX::Controls::ToolTipService::SetToolTip(_closePaneMenuItem, box_value(closePaneToolTip));
-            Automation::AutomationProperties::SetHelpText(_closePaneMenuItem, closePaneToolTip);
+            WUX::Controls::ToolTipService::SetToolTip(closePaneMenuItem, box_value(closePaneToolTip));
+            Automation::AutomationProperties::SetHelpText(closePaneMenuItem, closePaneToolTip);
         }
 
+        Controls::MenuFlyoutItem exportTabMenuItem;
         {
             // "Export tab"
             Controls::FontIcon exportTabSymbol;
             exportTabSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
             exportTabSymbol.Glyph(L"\xE74E"); // Save
 
-            _exportTabMenuItem.Click({ get_weak(), &Tab::_exportTextClicked });
-            _exportTabMenuItem.Text(RS_(L"ExportTabText"));
-            _exportTabMenuItem.Icon(exportTabSymbol);
+            exportTabMenuItem.Click({ get_weak(), &Tab::_exportTextClicked });
+            exportTabMenuItem.Text(RS_(L"ExportTabText"));
+            exportTabMenuItem.Icon(exportTabSymbol);
 
             const auto exportTabToolTip = RS_(L"ExportTabToolTip");
 
-            WUX::Controls::ToolTipService::SetToolTip(_exportTabMenuItem, box_value(exportTabToolTip));
-            Automation::AutomationProperties::SetHelpText(_exportTabMenuItem, exportTabToolTip);
+            WUX::Controls::ToolTipService::SetToolTip(exportTabMenuItem, box_value(exportTabToolTip));
+            Automation::AutomationProperties::SetHelpText(exportTabMenuItem, exportTabToolTip);
         }
 
+        Controls::MenuFlyoutItem findMenuItem;
         {
             // "Find"
             Controls::FontIcon findSymbol;
             findSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
             findSymbol.Glyph(L"\xF78B"); // SearchMedium
 
-            _findMenuItem.Click({ get_weak(), &Tab::_findClicked });
-            _findMenuItem.Text(RS_(L"FindText"));
-            _findMenuItem.Icon(findSymbol);
+            findMenuItem.Click({ get_weak(), &Tab::_findClicked });
+            findMenuItem.Text(RS_(L"FindText"));
+            findMenuItem.Icon(findSymbol);
 
             const auto findToolTip = RS_(L"FindToolTip");
 
-            WUX::Controls::ToolTipService::SetToolTip(_findMenuItem, box_value(findToolTip));
-            Automation::AutomationProperties::SetHelpText(_findMenuItem, findToolTip);
+            WUX::Controls::ToolTipService::SetToolTip(findMenuItem, box_value(findToolTip));
+            Automation::AutomationProperties::SetHelpText(findMenuItem, findToolTip);
         }
 
+        Controls::MenuFlyoutItem restartConnectionMenuItem = _restartConnectionMenuItem;
         {
-            // "Restart session"
+            // "Restart connection"
             Controls::FontIcon restartConnectionSymbol;
             restartConnectionSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
             restartConnectionSymbol.Glyph(L"\xE72C");
 
-            _restartConnectionMenuItem.Click([weakThis](auto&&, auto&&) {
+            restartConnectionMenuItem.Click([weakThis](auto&&, auto&&) {
                 if (auto tab{ weakThis.get() })
                 {
                     tab->_RestartActivePaneConnection();
                 }
             });
-            _restartConnectionMenuItem.Text(RS_(L"RestartConnectionText"));
-            _restartConnectionMenuItem.Icon(restartConnectionSymbol);
+            restartConnectionMenuItem.Text(RS_(L"RestartConnectionText"));
+            restartConnectionMenuItem.Icon(restartConnectionSymbol);
 
             const auto restartConnectionToolTip = RS_(L"RestartConnectionToolTip");
 
-            WUX::Controls::ToolTipService::SetToolTip(_restartConnectionMenuItem, box_value(restartConnectionToolTip));
-            Automation::AutomationProperties::SetHelpText(_restartConnectionMenuItem, restartConnectionToolTip);
+            WUX::Controls::ToolTipService::SetToolTip(restartConnectionMenuItem, box_value(restartConnectionToolTip));
+            Automation::AutomationProperties::SetHelpText(restartConnectionMenuItem, restartConnectionToolTip);
         }
 
         // Build the menu
@@ -1782,16 +1759,16 @@ namespace winrt::TerminalApp::implementation
         Controls::MenuFlyoutSeparator menuSeparator;
         contextMenuFlyout.Items().Append(chooseColorMenuItem);
         contextMenuFlyout.Items().Append(renameTabMenuItem);
-        contextMenuFlyout.Items().Append(_duplicateTabMenuItem);
-        contextMenuFlyout.Items().Append(_splitTabMenuItem);
+        contextMenuFlyout.Items().Append(duplicateTabMenuItem);
+        contextMenuFlyout.Items().Append(splitTabMenuItem);
         _AppendMoveMenuItems(contextMenuFlyout);
-        contextMenuFlyout.Items().Append(_exportTabMenuItem);
-        contextMenuFlyout.Items().Append(_findMenuItem);
-        contextMenuFlyout.Items().Append(_restartConnectionMenuItem);
+        contextMenuFlyout.Items().Append(exportTabMenuItem);
+        contextMenuFlyout.Items().Append(findMenuItem);
+        contextMenuFlyout.Items().Append(restartConnectionMenuItem);
         contextMenuFlyout.Items().Append(menuSeparator);
 
         auto closeSubMenu = _AppendCloseMenuItems(contextMenuFlyout);
-        closeSubMenu.Items().Append(_closePaneMenuItem);
+        closeSubMenu.Items().Append(closePaneMenuItem);
 
         // GH#5750 - When the context menu is dismissed with ESC, toss the focus
         // back to our control.

src/cascadia/TerminalApp/Tab.h

@@ -53,7 +53,7 @@ namespace winrt::TerminalApp::implementation
                                                                                                         const float splitSize,
                                                                                                         winrt::Windows::Foundation::Size availableSpace) const;
 
-        bool ResizePane(const winrt::Microsoft::Terminal::Settings::Model::ResizeDirection& direction);
+        void ResizePane(const winrt::Microsoft::Terminal::Settings::Model::ResizeDirection& direction);
         bool NavigateFocus(const winrt::Microsoft::Terminal::Settings::Model::FocusDirection& direction);
         bool SwapPane(const winrt::Microsoft::Terminal::Settings::Model::FocusDirection& direction);
         bool FocusPane(const uint32_t id);
@@ -121,7 +121,6 @@ namespace winrt::TerminalApp::implementation
 
         til::typed_event<TerminalApp::Tab, IInspectable> ActivePaneChanged;
         til::event<winrt::delegate<>> TabRaiseVisualBell;
-        til::event<winrt::delegate<winrt::hstring /*title*/, winrt::hstring /*body*/, winrt::TerminalApp::IPaneContent /*content*/>> TabToastNotificationRequested;
         til::typed_event<IInspectable, IInspectable> TaskbarProgressChanged;
 
         // The TabViewIndex is the index this Tab object resides in TerminalPage's _tabs vector.
@@ -141,17 +140,11 @@ namespace winrt::TerminalApp::implementation
         static constexpr double HeaderRenameBoxWidthTitleLength{ std::numeric_limits<double>::infinity() };
 
         winrt::Windows::UI::Xaml::FocusState _focusState{ winrt::Windows::UI::Xaml::FocusState::Unfocused };
-        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _duplicateTabMenuItem{};
-        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _splitTabMenuItem{};
+        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _closeOtherTabsMenuItem{};
+        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _closeTabsAfterMenuItem{};
         winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _moveToNewWindowMenuItem{};
         winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _moveRightMenuItem{};
         winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _moveLeftMenuItem{};
-        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _exportTabMenuItem{};
-        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _findMenuItem{};
-        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _restartConnectionMenuItem{};
-        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _closeOtherTabsMenuItem{};
-        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _closeTabsAfterMenuItem{};
-        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _closePaneMenuItem{};
         winrt::TerminalApp::ShortcutActionDispatch _dispatch;
         Microsoft::Terminal::Settings::Model::IActionMapView _actionMap{ nullptr };
         winrt::hstring _keyChord{};
@@ -166,6 +159,9 @@ namespace winrt::TerminalApp::implementation
         std::shared_ptr<Pane> _activePane{ nullptr };
         std::shared_ptr<Pane> _zoomedPane{ nullptr };
 
+        Windows::UI::Xaml::Controls::MenuFlyoutItem _closePaneMenuItem;
+        Windows::UI::Xaml::Controls::MenuFlyoutItem _restartConnectionMenuItem;
+
         winrt::Microsoft::Terminal::Settings::Model::IconStyle _lastIconStyle;
         winrt::hstring _lastIconPath{};
         std::optional<winrt::Windows::UI::Color> _runtimeTabColor{};
@@ -186,7 +182,6 @@ namespace winrt::TerminalApp::implementation
             winrt::TerminalApp::IPaneContent::ConnectionStateChanged_revoker ConnectionStateChanged;
             winrt::TerminalApp::IPaneContent::ReadOnlyChanged_revoker ReadOnlyChanged;
             winrt::TerminalApp::IPaneContent::FocusRequested_revoker FocusRequested;
-            winrt::TerminalApp::IPaneContent::NotificationRequested_revoker NotificationRequested;
 
             // These events literally only apply if the content is a TermControl.
             winrt::Microsoft::Terminal::Control::TermControl::KeySent_revoker KeySent;
@@ -225,7 +220,6 @@ namespace winrt::TerminalApp::implementation
         void _AttachEventHandlersToPane(std::shared_ptr<Pane> pane);
 
         void _UpdateActivePane(std::shared_ptr<Pane> pane);
-        void _UpdateMenuItemStates();
 
         winrt::hstring _GetActiveTitle() const;
 
@@ -236,6 +230,8 @@ namespace winrt::TerminalApp::implementation
         void _UpdateConnectionClosedState();
         void _RestartActivePaneConnection();
 
+        void _DuplicateTab();
+
         winrt::Windows::UI::Xaml::Media::Brush _BackgroundBrush();
 
         void _MakeTabViewItem();

src/cascadia/TerminalApp/TabManagement.cpp

@@ -17,7 +17,6 @@
 
 #include "TabRowControl.h"
 #include "DebugTapConnection.h"
-#include "DesktopNotification.h"
 #include "..\TerminalSettingsModel\FileUtils.h"
 #include "../TerminalSettingsAppAdapterLib/TerminalSettings.h"
 
@@ -151,18 +150,6 @@ namespace winrt::TerminalApp::implementation
             }
         });
 
-        // When a tab requests a desktop toast notification, send the toast
-        // and handle activation by summoning this window and switching to the tab.
-        newTabImpl->TabToastNotificationRequested([weakThis{ get_weak() }, weakTab{ newTabImpl->get_weak() }](const winrt::hstring& title, const winrt::hstring& body, const winrt::TerminalApp::IPaneContent& content) {
-            if (const auto page{ weakThis.get() })
-            {
-                if (const auto tab{ weakTab.get() })
-                {
-                    page->_SendDesktopNotification(title, body, tab, content);
-                }
-            }
-        });
-
         auto tabViewItem = newTabImpl->TabViewItem();
         _tabView.TabItems().InsertAt(insertPosition, tabViewItem);
 
@@ -407,9 +394,7 @@ namespace winrt::TerminalApp::implementation
     // - Removes the tab (both TerminalControl and XAML) after prompting for approval
     // Arguments:
     // - tab: the tab to remove
-    // - skipConfirmClose: if true, skip the confirmOnClose check. Used when
-    //   an aggregate confirmation has already been shown (i.e. close other tabs)
-    winrt::Windows::Foundation::IAsyncAction TerminalPage::_HandleCloseTabRequested(winrt::TerminalApp::Tab tab, bool skipConfirmClose)
+    winrt::Windows::Foundation::IAsyncAction TerminalPage::_HandleCloseTabRequested(winrt::TerminalApp::Tab tab)
     {
         winrt::com_ptr<TerminalPage> strong;
 
@@ -428,24 +413,6 @@ namespace winrt::TerminalApp::implementation
             }
         }
 
-        // Skip the per-tab confirmOnClose check when the caller has already
-        // shown an aggregate confirmation dialog (e.g. _RemoveTabs).
-        if (!skipConfirmClose)
-        {
-            const auto tabImpl = _GetTabImpl(tab);
-            if (tabImpl && _ShouldWarnOnCloseTab(tabImpl))
-            {
-                const auto weak = get_weak();
-
-                auto warningResult = co_await _ShowConfirmCloseDialog(ConfirmCloseDialogKind::Tab);
-                strong = weak.get();
-                if (!strong || warningResult != ContentDialogResult::Primary)
-                {
-                    co_return;
-                }
-            }
-        }
-
         auto t = winrt::get_self<implementation::Tab>(tab);
         auto actions = t->BuildStartupActions(BuildStartupKind::None);
         _AddPreviouslyClosedPaneOrTab(std::move(actions));
@@ -815,26 +782,6 @@ namespace winrt::TerminalApp::implementation
             if (const auto pane{ activeTab->GetActivePane() })
             {
                 const auto weak = get_weak();
-
-                // Check if we should warn before closing a single pane
-                // (only triggers on Always — Automatic doesn't warn for single pane)
-                const auto setting = _settings.GlobalSettings().ConfirmOnClose();
-                if (setting == ConfirmOnClose::Always)
-                {
-                    // If this is the last pane, closing it closes the tab,
-                    // so use the tab dialog text instead.
-                    const auto kind = activeTab->GetLeafPaneCount() == 1 ? ConfirmCloseDialogKind::Tab : ConfirmCloseDialogKind::Pane;
-                    auto warningResult = co_await _ShowConfirmCloseDialog(kind);
-
-                    // Hold a strong reference to `this` for the rest of the
-                    // method; we may be the last holder after `co_await`.
-                    auto strong = weak.get();
-                    if (!strong || warningResult != ContentDialogResult::Primary)
-                    {
-                        co_return;
-                    }
-                }
-
                 if (co_await _PaneConfirmCloseReadOnly(pane))
                 {
                     if (const auto strong = weak.get())
@@ -848,37 +795,10 @@ namespace winrt::TerminalApp::implementation
 
     // Method Description:
     // - Close all panes with the given IDs sequentially.
-    // - Shows a single aggregate confirmation dialog upfront if the confirmOnClose setting warrants it.
     // Arguments:
-    // - weakTab: weak reference to the tab that the panes belong to.
+    // - weakTab: weak reference to the tab that the pane belongs to.
     // - paneIds: collection of the IDs of the panes that are marked for removal.
-    safe_void_coroutine TerminalPage::_ClosePanes(weak_ref<Tab> weakTab, std::vector<uint32_t> paneIds)
-    {
-        // Show a single aggregate confirmation for closing multiple panes.
-        if (_settings.GlobalSettings().ConfirmOnClose() != ConfirmOnClose::Never)
-        {
-            const auto weak = get_weak();
-            auto warningResult = co_await _ShowConfirmCloseDialog(ConfirmCloseDialogKind::MultiplePanes);
-
-            // Hold a strong reference to `this` after the co_await; we may
-            // be the last holder if the page was being torn down.
-            auto strong = weak.get();
-            if (!strong || warningResult != ContentDialogResult::Primary)
-            {
-                co_return;
-            }
-        }
-        _CloseRemainingPanes(weakTab, std::move(paneIds));
-    }
-
-    // Method Description:
-    // - Recursively closes panes by ID, chaining each close via the
-    //   ClosedByParent callback. Called after confirmation has already
-    //   been handled by _ClosePanes.
-    // Arguments:
-    // - weakTab: weak reference to the tab that the panes belong to
-    // - paneIds: remaining pane IDs to close
-    void TerminalPage::_CloseRemainingPanes(weak_ref<Tab> weakTab, std::vector<uint32_t> paneIds)
+    void TerminalPage::_ClosePanes(weak_ref<Tab> weakTab, std::vector<uint32_t> paneIds)
     {
         if (auto strongTab{ weakTab.get() })
         {
@@ -893,9 +813,10 @@ namespace winrt::TerminalApp::implementation
                     pane->ClosedByParent([ids{ std::move(paneIds) }, weakThis{ get_weak() }, weakTab]() {
                         if (auto strongThis{ weakThis.get() })
                         {
-                            strongThis->_CloseRemainingPanes(weakTab, std::move(ids));
+                            strongThis->_ClosePanes(weakTab, std::move(ids));
                         }
                     });
+
                     // Close the pane which will eventually trigger the closed by parent event
                     _HandleClosePaneRequested(pane);
                     break;
@@ -920,37 +841,18 @@ namespace winrt::TerminalApp::implementation
 
     // Method Description:
     // - Closes provided tabs one by one
-    // - Shows a single aggregate confirmation dialog upfront if the confirmOnClose setting warrants it.
     // Arguments:
     // - tabs - tabs to remove
     safe_void_coroutine TerminalPage::_RemoveTabs(const std::vector<winrt::TerminalApp::Tab> tabs)
     {
-        if (tabs.empty())
-        {
-            co_return;
-        }
-
-        // Show a single aggregate confirmation instead of per-tab dialogs.
         const auto weak = get_weak();
-        if (_settings.GlobalSettings().ConfirmOnClose() != ConfirmOnClose::Never)
-        {
-            auto warningResult = co_await _ShowConfirmCloseDialog(ConfirmCloseDialogKind::MultipleTabs);
-
-            // Hold a strong reference to `this` after the co_await so that
-            // the for-loop below can safely dispatch on us.
-            auto strong = weak.get();
-            if (!strong || warningResult != ContentDialogResult::Primary)
-            {
-                co_return;
-            }
-        }
 
         for (auto& tab : tabs)
         {
             winrt::Windows::Foundation::IAsyncAction action{ nullptr };
             if (const auto strong = weak.get())
             {
-                action = _HandleCloseTabRequested(tab, /*skipConfirmClose*/ true);
+                action = _HandleCloseTabRequested(tab);
             }
 
             if (!action)
@@ -1283,128 +1185,4 @@ namespace winrt::TerminalApp::implementation
     {
         return _tabs.Size() > 1;
     }
-
-    // Method Description:
-    // - Attempts to find and focus the given tab in this window.
-    // Arguments:
-    // - tab: The tab to focus.
-    // Return Value:
-    // - true if the tab was found and focused, false otherwise.
-    bool TerminalPage::FocusTab(const winrt::TerminalApp::Tab& tab)
-    {
-        if (const auto tabIndex{ _GetTabIndex(tab) })
-        {
-            _SelectTab(tabIndex.value());
-            return true;
-        }
-        return false;
-    }
-
-    // Method Description:
-    // - Sends a desktop toast notification with the given title and body.
-    //   When the toast is activated (clicked), the window is summoned and
-    //   the originating tab is focused.
-    // Arguments:
-    // - tabTitle: The title to display in the notification.
-    // - body: The body text. If empty, a standard tab-activity message is built.
-    // - tab: The tab to switch to when the toast is activated.
-    void TerminalPage::_SendDesktopNotification(const winrt::hstring& tabTitle, const winrt::hstring& body, const winrt::com_ptr<Tab>& tab, const winrt::TerminalApp::IPaneContent& content)
-    {
-        // Don't send a notification if the window is focused and the requesting
-        // pane is the active pane. The user is already looking at it.
-        if (_activated && tab == _GetFocusedTabImpl())
-        {
-            if (const auto activePane{ tab->GetActivePane() })
-            {
-                if (activePane->GetContent() == content)
-                {
-                    return;
-                }
-            }
-        }
-
-        // Build the notification message.
-        // If a custom body is provided (e.g. from OSC 777), use the title/body directly.
-        // Otherwise, build the standard tab-activity notification message.
-        winrt::hstring notificationTitle;
-        winrt::hstring message;
-        if (!body.empty())
-        {
-            notificationTitle = tabTitle;
-            message = body;
-        }
-        else
-        {
-            // Use the window name if available for context; otherwise just use the tab title.
-            // Use the raw WindowName (not WindowNameForDisplay) so we don't include
-            // the "<unnamed window>" placeholder in the notification body.
-            const auto windowName = _WindowProperties ? _WindowProperties.WindowName() : winrt::hstring{};
-            if (!windowName.empty())
-            {
-                message = RS_fmt(L"NotificationMessage_TabActivityInWindow", std::wstring_view{ tabTitle }, std::wstring_view{ windowName });
-            }
-            else
-            {
-                message = RS_fmt(L"NotificationMessage_TabActivity", std::wstring_view{ tabTitle });
-            }
-            notificationTitle = CascadiaSettings::ApplicationDisplayName();
-        }
-
-        // Use the Tab object's identity hash as a stable toast tag.
-        // This survives tab reordering and cross-window moves.
-        const auto tabHash = std::hash<winrt::Windows::Foundation::IUnknown>{}(*tab);
-        const hstring tabTag{ fmt::format(FMT_COMPILE(L"wt-tab-{:016x}"), tabHash) };
-
-        const implementation::DesktopNotificationArgs args{
-            .Title = notificationTitle,
-            .Message = message,
-            .Tag = tabTag
-        };
-
-        implementation::DesktopNotification::SendNotification(args, [weakThis{ get_weak() }, weakTab{ tab->get_weak() }, weakContent{ winrt::make_weak(content) }]() {
-            if (const auto page{ weakThis.get() })
-            {
-                // The toast Activated callback runs on a background thread.
-                // Marshal to the UI thread for tab focus and window summon.
-                page->Dispatcher().RunAsync(winrt::Windows::UI::Core::CoreDispatcherPriority::Normal, [weakPage{ page->get_weak() }, weakTab, weakContent]() {
-                    if (const auto p{ weakPage.get() })
-                    {
-                        if (const auto t{ weakTab.get() })
-                        {
-                            // Try to find and focus the tab in this window first.
-                            if (const auto tabIndex{ p->_GetTabIndex(*t) })
-                            {
-                                p->SummonWindowRequested.raise(nullptr, nullptr);
-                                p->_SelectTab(tabIndex.value());
-
-                                // Focus the specific pane that raised the notification.
-                                if (const auto paneContent{ weakContent.get() })
-                                {
-                                    const auto rootPane = t->GetRootPane();
-                                    rootPane->WalkTree([&](const auto& pane) {
-                                        if (pane->GetContent() == paneContent)
-                                        {
-                                            rootPane->FocusPane(pane);
-                                        }
-                                    });
-                                }
-                            }
-                            else
-                            {
-                                // The tab may have moved to another window.
-                                // Raise FocusTabRequested so the emperor can
-                                // search all windows for it.
-                                p->FocusTabRequested.raise(nullptr, *t);
-                            }
-                        }
-                        else
-                        {
-                            // Tab was closed. Just summon this window.
-                            p->SummonWindowRequested.raise(nullptr, nullptr);
-                        }
-                    }
-                });
-            }
-        });
-    }
 }

src/cascadia/TerminalApp/TabRowControl.xaml

@@ -71,9 +71,11 @@
                     <ToolTipService.ToolTip>
                         <ToolTip Placement="Mouse">
                             <TextBlock TextWrapping="Wrap">
-                                <Run x:Uid="NewTabRun" /> <LineBreak /><LineBreak />
-                                <Run x:Uid="NewPaneRun" /> <LineBreak />
-                                <Run x:Uid="NewWindowRun" />
+                                <Run x:Uid="NewTabRun" /> <LineBreak />
+                                <Run x:Uid="NewPaneRun"
+                                     FontStyle="Italic" /> <LineBreak />
+                                <Run x:Uid="NewWindowRun"
+                                     FontStyle="Italic" />
                             </TextBlock>
                         </ToolTip>
                     </ToolTipService.ToolTip>

src/cascadia/TerminalApp/TerminalAppLib.vcxproj

@@ -174,7 +174,6 @@
       <DependentUpon>TerminalPaneContent.idl</DependentUpon>
     </ClInclude>
     <ClInclude Include="Toast.h" />
-    <ClInclude Include="DesktopNotification.h" />
     <ClInclude Include="TerminalSettingsCache.h" />
     <ClInclude Include="SuggestionsControl.h">
       <DependentUpon>SuggestionsControl.xaml</DependentUpon>
@@ -288,7 +287,6 @@
     </ClCompile>
     <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
     <ClCompile Include="Toast.cpp" />
-    <ClCompile Include="DesktopNotification.cpp" />
     <ClCompile Include="TerminalSettingsCache.cpp" />
     <ClCompile Include="SuggestionsControl.cpp">
       <DependentUpon>SuggestionsControl.xaml</DependentUpon>

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -884,78 +884,26 @@ namespace winrt::TerminalApp::implementation
     }
 
     // Method Description:
-    // - Displays the unified close confirmation dialog configured for the
-    //   given scenario. Resets the "don't ask me again" checkbox before showing.
-    //   If the user confirms and checked "don't ask me again", sets
-    //   confirmOnClose to Never and writes settings to disk.
+    // - Displays a dialog to warn the user that they are about to close all open windows.
+    //   Once the user clicks the OK button, shut down the application.
+    //   If cancel is clicked, the dialog will close.
     // - Only one dialog can be visible at a time. If another dialog is visible
     //   when this is called, nothing happens. See _ShowDialog for details
-    winrt::Windows::Foundation::IAsyncOperation<ContentDialogResult> TerminalPage::_ShowConfirmCloseDialog(ConfirmCloseDialogKind kind)
+    winrt::Windows::Foundation::IAsyncOperation<ContentDialogResult> TerminalPage::_ShowQuitDialog()
     {
-        // Load the dialog (triggers x:Load) and configure its strings.
-        const auto dialog = FindName(L"ConfirmCloseDialog").as<ContentDialog>();
+        return _ShowDialogHelper(L"QuitDialog");
+    }
 
-        winrt::hstring title;
-        winrt::hstring primary;
-        switch (kind)
-        {
-        case ConfirmCloseDialogKind::CloseAll:
-            title = RS_(L"ConfirmCloseDialog_CloseAllTitle");
-            primary = RS_(L"ConfirmCloseDialog_CloseAllPrimary");
-            break;
-        case ConfirmCloseDialogKind::Window:
-            title = RS_(L"ConfirmCloseDialog_WindowTitle");
-            primary = RS_(L"ConfirmCloseDialog_WindowPrimary");
-            break;
-        case ConfirmCloseDialogKind::Tab:
-            title = RS_(L"ConfirmCloseDialog_TabTitle");
-            primary = RS_(L"ConfirmCloseDialog_TabPrimary");
-            break;
-        case ConfirmCloseDialogKind::MultiplePanes:
-            title = RS_(L"ConfirmCloseDialog_MultiplePanesTitle");
-            primary = RS_(L"ConfirmCloseDialog_MultiplePanesPrimary");
-            break;
-        case ConfirmCloseDialogKind::MultipleTabs:
-            title = RS_(L"ConfirmCloseDialog_MultipleTabsTitle");
-            primary = RS_(L"ConfirmCloseDialog_MultipleTabsPrimary");
-            break;
-        case ConfirmCloseDialogKind::Pane:
-            title = RS_(L"ConfirmCloseDialog_PaneTitle");
-            primary = RS_(L"ConfirmCloseDialog_PanePrimary");
-            break;
-        }
-        dialog.Title(winrt::box_value(title));
-        dialog.PrimaryButtonText(primary);
-        dialog.CloseButtonText(RS_(L"ConfirmCloseDialog_Cancel"));
-
-        // BODGY: After a ContentDialog is dismissed, FindName() can no longer
-        // resolve children inside it. Use Content() to get the checkbox directly.
-        const auto checkbox = dialog.Content().as<CheckBox>();
-        checkbox.IsChecked(false);
-
-        auto result = ContentDialogResult::None;
-        if (auto presenter{ _dialogPresenter.get() })
-        {
-            const auto weak = get_weak();
-            result = co_await presenter.ShowDialog(dialog);
-
-            // ShowDialog blocks until the dialog is dismissed, so it is
-            // possible for `this` to be torn down while we wait. Re-acquire
-            // a strong reference before touching any of our state.
-            const auto strong = weak.get();
-            if (!strong)
-            {
-                co_return ContentDialogResult::None;
-            }
-
-            if (result == ContentDialogResult::Primary && checkbox.IsChecked().Value())
-            {
-                _settings.GlobalSettings().ConfirmOnClose(ConfirmOnClose::Never);
-                _settings.WriteSettingsToDisk();
-            }
-        }
-
-        co_return result;
+    // Method Description:
+    // - Displays a dialog for warnings found while closing the terminal app using
+    //   key binding with multiple tabs opened. Display messages to warn user
+    //   that more than 1 tab is opened, and once the user clicks the OK button, remove
+    //   all the tabs and shut down and app. If cancel is clicked, the dialog will close
+    // - Only one dialog can be visible at a time. If another dialog is visible
+    //   when this is called, nothing happens. See _ShowDialog for details
+    winrt::Windows::Foundation::IAsyncOperation<ContentDialogResult> TerminalPage::_ShowCloseWarningDialog()
+    {
+        return _ShowDialogHelper(L"CloseAllDialog");
     }
 
     // Method Description:
@@ -1295,15 +1243,17 @@ namespace winrt::TerminalApp::implementation
         newTabRun.Text(RS_(L"NewTabRun/Text"));
         auto newPaneRun = WUX::Documents::Run();
         newPaneRun.Text(RS_(L"NewPaneRun/Text"));
+        newPaneRun.FontStyle(FontStyle::Italic);
         auto newWindowRun = WUX::Documents::Run();
         newWindowRun.Text(RS_(L"NewWindowRun/Text"));
+        newWindowRun.FontStyle(FontStyle::Italic);
         auto elevatedRun = WUX::Documents::Run();
         elevatedRun.Text(RS_(L"ElevatedRun/Text"));
+        elevatedRun.FontStyle(FontStyle::Italic);
 
         auto textBlock = WUX::Controls::TextBlock{};
         textBlock.Inlines().Append(newTabRun);
         textBlock.Inlines().Append(WUX::Documents::LineBreak{});
-        textBlock.Inlines().Append(WUX::Documents::LineBreak{});
         textBlock.Inlines().Append(newPaneRun);
         textBlock.Inlines().Append(WUX::Documents::LineBreak{});
         textBlock.Inlines().Append(newWindowRun);
@@ -2259,13 +2209,12 @@ namespace winrt::TerminalApp::implementation
     //   signal that we want to close everything.
     safe_void_coroutine TerminalPage::RequestQuit()
     {
-        const auto setting = _settings.GlobalSettings().ConfirmOnClose();
-        if (setting != ConfirmOnClose::Never && !_displayingCloseDialog)
+        if (!_displayingCloseDialog)
         {
             _displayingCloseDialog = true;
 
             const auto weak = get_weak();
-            auto warningResult = co_await _ShowConfirmCloseDialog(ConfirmCloseDialogKind::CloseAll);
+            auto warningResult = co_await _ShowQuitDialog();
             const auto strong = weak.get();
             if (!strong)
             {
@@ -2278,9 +2227,9 @@ namespace winrt::TerminalApp::implementation
             {
                 co_return;
             }
-        }
 
-        QuitRequested.raise(nullptr, nullptr);
+            QuitRequested.raise(nullptr, nullptr);
+        }
     }
 
     void TerminalPage::PersistState()
@@ -2358,59 +2307,12 @@ namespace winrt::TerminalApp::implementation
     }
 
     // Method Description:
-    // - Determines whether a close-window action should show a confirmation
-    //   dialog, based on the confirmOnClose setting and the current window state.
-    // Arguments:
-    // - <none>
-    // Return Value:
-    // - true, if a warning dialog should be shown before closing the window
-    bool TerminalPage::_ShouldWarnOnClose() const
-    {
-        const auto setting = _settings.GlobalSettings().ConfirmOnClose();
-        switch (setting)
-        {
-        case ConfirmOnClose::Always:
-            return true;
-        case ConfirmOnClose::Automatic:
-        {
-            // Warn if there's more than one tab, or the one tab has more than one pane.
-            return _HasMultipleTabs() || _GetTabImpl(_tabs.GetAt(0))->GetLeafPaneCount() > 1;
-        }
-        case ConfirmOnClose::Never:
-        default:
-            return false;
-        }
-    }
-
-    // Method Description:
-    // - Determines whether closing a specific tab should show a confirmation
-    //   dialog, based on the confirmOnClose setting and the tab's state.
-    // Arguments:
-    // - tab: The tab being closed
-    // Return Value:
-    // - true, if a warning dialog should be shown before closing the tab
-    bool TerminalPage::_ShouldWarnOnCloseTab(const winrt::com_ptr<Tab>& tab) const
-    {
-        const auto setting = _settings.GlobalSettings().ConfirmOnClose();
-        switch (setting)
-        {
-        case ConfirmOnClose::Always:
-            return true;
-        case ConfirmOnClose::Automatic:
-            // Warn if this tab has more than one pane.
-            return tab->GetLeafPaneCount() > 1;
-        case ConfirmOnClose::Never:
-        default:
-            return false;
-        }
-    }
-
-    // Method Description:
-    // - Close the terminal app. If the confirmOnClose setting indicates we should
-    //   warn for the current window state, show a warning dialog.
+    // - Close the terminal app. If there is more
+    //   than one tab opened, show a warning dialog.
     safe_void_coroutine TerminalPage::CloseWindow()
     {
-        if (_ShouldWarnOnClose() &&
+        if (_HasMultipleTabs() &&
+            _settings.GlobalSettings().ConfirmCloseAllTabs() &&
             !_displayingCloseDialog)
         {
             if (_newTabButton && _newTabButton.Flyout())
@@ -2419,17 +2321,7 @@ namespace winrt::TerminalApp::implementation
             }
             _DismissTabContextMenus();
             _displayingCloseDialog = true;
-
-            const auto weak = get_weak();
-            auto warningResult = co_await _ShowConfirmCloseDialog(ConfirmCloseDialogKind::Window);
-            // Hold a strong reference to `this` after the co_await; we may
-            // be the last holder if the window was already being torn down.
-            auto strong = weak.get();
-            if (!strong)
-            {
-                co_return;
-            }
-
+            auto warningResult = co_await _ShowCloseWarningDialog();
             _displayingCloseDialog = false;
 
             if (warningResult != ContentDialogResult::Primary)
@@ -2898,15 +2790,14 @@ namespace winrt::TerminalApp::implementation
     // Arguments:
     // - direction: The direction to move the separator in.
     // Return Value:
-    // - whether a pane was resized
-    bool TerminalPage::_ResizePane(const ResizeDirection& direction)
+    // - <none>
+    void TerminalPage::_ResizePane(const ResizeDirection& direction)
     {
         if (const auto tabImpl{ _GetFocusedTabImpl() })
         {
             _UnZoomIfNeeded();
-            return tabImpl->ResizePane(direction);
+            tabImpl->ResizePane(direction);
         }
-        return false;
     }
 
     // Method Description:
@@ -3305,15 +3196,13 @@ namespace winrt::TerminalApp::implementation
         return true;
     }
 
-    bool TerminalPage::_IsUriConsideredSomewhatSafe(const winrt::Windows::Foundation::Uri& parsedUri) const
+    bool TerminalPage::_IsUriConsideredSomewhatSafe(const winrt::Windows::Foundation::Uri& parsedUri)
     {
-        const auto& schemeName = parsedUri.SchemeName();
-
-        if (schemeName == L"http" || schemeName == L"https")
+        if (parsedUri.SchemeName() == L"http" || parsedUri.SchemeName() == L"https")
         {
             return true;
         }
-        if (schemeName == L"file")
+        if (parsedUri.SchemeName() == L"file")
         {
             static const auto pathext{ wil::TryGetEnvironmentVariableW<std::wstring>(L"PATHEXT") };
             const auto filename = parsedUri.Path();
@@ -3327,16 +3216,6 @@ namespace winrt::TerminalApp::implementation
 
             return true;
         }
-        if (const auto& safeSchemes = _settings.GlobalSettings().SafeUriSchemes())
-        {
-            for (const auto& scheme : safeSchemes)
-            {
-                if (til::equals_insensitive_ascii(schemeName, scheme))
-                {
-                    return true;
-                }
-            }
-        }
 
         return false;
     }

src/cascadia/TerminalApp/TerminalPage.h

@@ -54,16 +54,6 @@ namespace winrt::TerminalApp::implementation
         ScrollDown = 1
     };
 
-    enum class ConfirmCloseDialogKind
-    {
-        Pane,
-        Tab,
-        MultiplePanes,
-        MultipleTabs,
-        Window,
-        CloseAll
-    };
-
     struct RenameWindowRequestedArgs : RenameWindowRequestedArgsT<RenameWindowRequestedArgs>
     {
         WINRT_PROPERTY(winrt::hstring, ProposedName);
@@ -178,7 +168,6 @@ namespace winrt::TerminalApp::implementation
 
         void OpenSettingsUI();
         void WindowActivated(const bool activated);
-        bool FocusTab(const winrt::TerminalApp::Tab& tab);
 
         bool OnDirectKeyEvent(const uint32_t vkey, const uint8_t scanCode, const bool down);
 
@@ -203,7 +192,6 @@ namespace winrt::TerminalApp::implementation
         til::typed_event<IInspectable, IInspectable> IdentifyWindowsRequested;
         til::typed_event<IInspectable, winrt::TerminalApp::RenameWindowRequestedArgs> RenameWindowRequested;
         til::typed_event<IInspectable, IInspectable> SummonWindowRequested;
-        til::typed_event<IInspectable, winrt::TerminalApp::Tab> FocusTabRequested;
         til::typed_event<IInspectable, winrt::Microsoft::Terminal::Control::WindowSizeChangedEventArgs> WindowSizeChanged;
 
         til::typed_event<IInspectable, IInspectable> OpenSystemMenu;
@@ -313,7 +301,8 @@ namespace winrt::TerminalApp::implementation
         winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::UI::Xaml::Controls::ContentDialogResult> _ShowDialogHelper(const std::wstring_view& name);
 
         void _ShowAboutDialog();
-        winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::UI::Xaml::Controls::ContentDialogResult> _ShowConfirmCloseDialog(ConfirmCloseDialogKind kind);
+        winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::UI::Xaml::Controls::ContentDialogResult> _ShowQuitDialog();
+        winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::UI::Xaml::Controls::ContentDialogResult> _ShowCloseWarningDialog();
         winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::UI::Xaml::Controls::ContentDialogResult> _ShowCloseReadOnlyDialog();
         winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::UI::Xaml::Controls::ContentDialogResult> _ShowMultiLinePasteWarningDialog();
         winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::UI::Xaml::Controls::ContentDialogResult> _ShowLargePasteWarningDialog();
@@ -360,7 +349,7 @@ namespace winrt::TerminalApp::implementation
 
         safe_void_coroutine _ExportTab(const Tab& tab, winrt::hstring filepath);
 
-        winrt::Windows::Foundation::IAsyncAction _HandleCloseTabRequested(winrt::TerminalApp::Tab tab, bool skipConfirmClose = false);
+        winrt::Windows::Foundation::IAsyncAction _HandleCloseTabRequested(winrt::TerminalApp::Tab tab);
         void _CloseTabAtIndex(uint32_t index);
         void _RemoveTab(const winrt::TerminalApp::Tab& tab);
         safe_void_coroutine _RemoveTabs(const std::vector<winrt::TerminalApp::Tab> tabs);
@@ -411,12 +400,9 @@ namespace winrt::TerminalApp::implementation
         TerminalApp::Tab _GetTabByTabViewItem(const IInspectable& tabViewItem) const noexcept;
 
         void _HandleClosePaneRequested(std::shared_ptr<Pane> pane);
-        bool _ShouldWarnOnClose() const;
-        bool _ShouldWarnOnCloseTab(const winrt::com_ptr<Tab>& tab) const;
         safe_void_coroutine _SetFocusedTab(const winrt::TerminalApp::Tab tab);
         safe_void_coroutine _CloseFocusedPane();
-        safe_void_coroutine _ClosePanes(weak_ref<Tab> weakTab, std::vector<uint32_t> paneIds);
-        void _CloseRemainingPanes(weak_ref<Tab> weakTab, std::vector<uint32_t> paneIds);
+        void _ClosePanes(weak_ref<Tab> weakTab, std::vector<uint32_t> paneIds);
         winrt::Windows::Foundation::IAsyncOperation<bool> _PaneConfirmCloseReadOnly(std::shared_ptr<Pane> pane);
         void _AddPreviouslyClosedPaneOrTab(std::vector<Microsoft::Terminal::Settings::Model::ActionAndArgs>&& args);
 
@@ -426,7 +412,7 @@ namespace winrt::TerminalApp::implementation
                         const Microsoft::Terminal::Settings::Model::SplitDirection splitType,
                         const float splitSize,
                         std::shared_ptr<Pane> newPane);
-        bool _ResizePane(const Microsoft::Terminal::Settings::Model::ResizeDirection& direction);
+        void _ResizePane(const Microsoft::Terminal::Settings::Model::ResizeDirection& direction);
         void _ToggleSplitOrientation();
 
         void _ScrollPage(ScrollDirection scrollDirection);
@@ -438,7 +424,7 @@ namespace winrt::TerminalApp::implementation
 
         safe_void_coroutine _OpenHyperlinkHandler(const IInspectable sender, const Microsoft::Terminal::Control::OpenHyperlinkEventArgs eventArgs);
         static bool _IsUriSupported(const winrt::Windows::Foundation::Uri& parsedUri);
-        bool _IsUriConsideredSomewhatSafe(const winrt::Windows::Foundation::Uri& parsedUri) const;
+        static bool _IsUriConsideredSomewhatSafe(const winrt::Windows::Foundation::Uri& parsedUri);
 
         void _ShowCouldNotOpenDialog(winrt::hstring reason, winrt::hstring uri);
         bool _CopyText(bool dismissSelection, bool singleLine, bool withControlSequences, Microsoft::Terminal::Control::CopyFormat formats);
@@ -585,8 +571,6 @@ namespace winrt::TerminalApp::implementation
         void _activePaneChanged(winrt::TerminalApp::Tab tab, Windows::Foundation::IInspectable args);
         safe_void_coroutine _doHandleSuggestions(Microsoft::Terminal::Settings::Model::SuggestionsArgs realArgs);
 
-        void _SendDesktopNotification(const winrt::hstring& tabTitle, const winrt::hstring& body, const winrt::com_ptr<Tab>& tab, const winrt::TerminalApp::IPaneContent& content);
-
 #pragma region ActionHandlers
         // These are all defined in AppActionHandlers.cpp
 #define ON_ALL_ACTIONS(action) DECLARE_ACTION_HANDLER(action);

src/cascadia/TerminalApp/TerminalPage.xaml

@@ -86,12 +86,17 @@
                            Grid.Row="2"
                            x:Load="False" />
 
-        <ContentDialog x:Name="ConfirmCloseDialog"
+        <ContentDialog x:Name="QuitDialog"
+                       x:Uid="QuitDialog"
                        Grid.Row="2"
                        x:Load="False"
-                       DefaultButton="Primary">
-            <CheckBox x:Uid="DontAskAgainCheckBox" />
-        </ContentDialog>
+                       DefaultButton="Primary" />
+
+        <ContentDialog x:Name="CloseAllDialog"
+                       x:Uid="CloseAllDialog"
+                       Grid.Row="2"
+                       x:Load="False"
+                       DefaultButton="Primary" />
 
         <ContentDialog x:Name="CloseReadOnlyDialog"
                        x:Uid="CloseReadOnlyDialog"

src/cascadia/TerminalApp/TerminalPaneContent.cpp

@@ -71,6 +71,18 @@ namespace winrt::TerminalApp::implementation
         _removeControlEvents();
 
         _control.Close();
+
+        // Clear out our media player callbacks, and stop any playing media. This
+        // will prevent the callback from being triggered after we've closed, and
+        // also make sure that our sound stops when we're closed.
+        if (_bellPlayer)
+        {
+            _bellPlayer.Pause();
+            _bellPlayer.Source(nullptr);
+            _bellPlayer.Close();
+            _bellPlayer = nullptr;
+            _bellPlayerCreated = false;
+        }
     }
 
     winrt::hstring TerminalPaneContent::Icon() const
@@ -263,15 +275,14 @@ namespace winrt::TerminalApp::implementation
                     auto sounds{ _profile.BellSound() };
                     if (sounds && sounds.Size() > 0)
                     {
-                        // Sound paths are resolved and validated by CascadiaSettings
-                        // before we reach this point.
-                        auto soundPath{ sounds.GetAt(rand() % sounds.Size()).Resolved() };
-                        PlaySoundW(soundPath.c_str(), nullptr, SND_FILENAME | SND_ASYNC | SND_SENTRY | SND_NODEFAULT);
+                        winrt::hstring soundPath{ sounds.GetAt(rand() % sounds.Size()).Resolved() };
+                        winrt::Windows::Foundation::Uri uri{ soundPath };
+                        _playBellSound(uri);
                     }
                     else
                     {
-                        const auto soundAlias = reinterpret_cast<LPCWSTR>(SND_ALIAS_SYSTEMHAND);
-                        PlaySoundW(soundAlias, nullptr, SND_ALIAS_ID | SND_ASYNC | SND_SENTRY);
+                        const auto soundAlias = reinterpret_cast<LPCTSTR>(SND_ALIAS_SYSTEMHAND);
+                        PlaySound(soundAlias, NULL, SND_ALIAS_ID | SND_ASYNC | SND_SENTRY);
                     }
                 }
 
@@ -280,15 +291,40 @@ namespace winrt::TerminalApp::implementation
                     _control.BellLightOn();
                 }
 
-                // raise the event with the bool values corresponding to the taskbar and notification flags
+                // raise the event with the bool value corresponding to the taskbar flag
                 BellRequested.raise(*this,
-                                    *winrt::make_self<TerminalApp::implementation::BellEventArgs>(
-                                        WI_IsFlagSet(_profile.BellStyle(), BellStyle::Taskbar),
-                                        WI_IsFlagSet(_profile.BellStyle(), BellStyle::Notification)));
+                                    *winrt::make_self<TerminalApp::implementation::BellEventArgs>(WI_IsFlagSet(_profile.BellStyle(), BellStyle::Taskbar)));
             }
         }
     }
 
+    safe_void_coroutine TerminalPaneContent::_playBellSound(winrt::Windows::Foundation::Uri uri)
+    {
+        auto weakThis{ get_weak() };
+        co_await wil::resume_foreground(_control.Dispatcher());
+        if (auto pane{ weakThis.get() })
+        {
+            if (!_bellPlayerCreated)
+            {
+                // The MediaPlayer might not exist on Windows N SKU.
+                try
+                {
+                    _bellPlayerCreated = true;
+                    _bellPlayer = winrt::Windows::Media::Playback::MediaPlayer();
+                    // GH#12258: The media keys (like play/pause) should have no effect on our bell sound.
+                    _bellPlayer.CommandManager().IsEnabled(false);
+                }
+                CATCH_LOG();
+            }
+            if (_bellPlayer)
+            {
+                const auto source{ winrt::Windows::Media::Core::MediaSource::CreateFromUri(uri) };
+                const auto item{ winrt::Windows::Media::Playback::MediaPlaybackItem(source) };
+                _bellPlayer.Source(item);
+                _bellPlayer.Play();
+            }
+        }
+    }
     void TerminalPaneContent::_closeTerminalRequestedHandler(const winrt::Windows::Foundation::IInspectable& /*sender*/,
                                                              const winrt::Windows::Foundation::IInspectable& /*args*/)
     {

src/cascadia/TerminalApp/TerminalPaneContent.h

@@ -4,7 +4,6 @@
 #pragma once
 #include "TerminalPaneContent.g.h"
 #include "BellEventArgs.g.h"
-#include "NotificationEventArgs.g.h"
 #include "BasicPaneEvents.h"
 
 namespace winrt::TerminalApp::implementation
@@ -14,21 +13,10 @@ namespace winrt::TerminalApp::implementation
     struct BellEventArgs : public BellEventArgsT<BellEventArgs>
     {
     public:
-        BellEventArgs(bool flashTaskbar, bool sendNotification) :
-            FlashTaskbar(flashTaskbar), SendNotification(sendNotification) {}
+        BellEventArgs(bool flashTaskbar) :
+            FlashTaskbar(flashTaskbar) {}
 
         til::property<bool> FlashTaskbar;
-        til::property<bool> SendNotification;
-    };
-
-    struct NotificationEventArgs : public NotificationEventArgsT<NotificationEventArgs>
-    {
-    public:
-        NotificationEventArgs(const winrt::hstring& title = {}, const winrt::hstring& body = {}) :
-            Title(title), Body(body) {}
-
-        til::property<winrt::hstring> Title;
-        til::property<winrt::hstring> Body;
     };
 
     struct TerminalPaneContent : TerminalPaneContentT<TerminalPaneContent>, BasicPaneEvents
@@ -76,6 +64,9 @@ namespace winrt::TerminalApp::implementation
         std::shared_ptr<TerminalSettingsCache> _cache{};
         bool _isDefTermSession{ false };
 
+        winrt::Windows::Media::Playback::MediaPlayer _bellPlayer{ nullptr };
+        bool _bellPlayerCreated{ false };
+
         struct ControlEventTokens
         {
             winrt::Microsoft::Terminal::Control::TermControl::ConnectionStateChanged_revoker _ConnectionStateChanged;
@@ -93,6 +84,8 @@ namespace winrt::TerminalApp::implementation
         void _setupControlEvents();
         void _removeControlEvents();
 
+        safe_void_coroutine _playBellSound(winrt::Windows::Foundation::Uri uri);
+
         safe_void_coroutine _controlConnectionStateChangedHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& /*args*/);
         void _controlWarningBellHandler(const winrt::Windows::Foundation::IInspectable& sender,
                                         const winrt::Windows::Foundation::IInspectable& e);

src/cascadia/TerminalApp/TerminalWindow.cpp

@@ -108,19 +108,13 @@ static Documents::Run _BuildErrorRun(const winrt::hstring& text, const ResourceD
     Documents::Run textRun;
     textRun.Text(text);
 
-    // GH #18147 - In High Contrast mode, don't override the foreground.
-    // Let the text inherit the system HC text color from its parent element,
-    // since SystemErrorTextColor doesn't adapt to High Contrast themes.
-    if (!winrt::Windows::UI::ViewManagement::AccessibilitySettings{}.HighContrast())
+    // Color the text red (light theme) or yellow (dark theme) based on the system theme
+    auto key = winrt::box_value(L"ErrorTextBrush");
+    if (resources.HasKey(key))
     {
-        // Color the text red (light theme) or yellow (dark theme) based on the system theme
-        auto key = winrt::box_value(L"ErrorTextBrush");
-        if (resources.HasKey(key))
-        {
-            auto g = resources.Lookup(key);
-            auto brush = g.try_as<winrt::Windows::UI::Xaml::Media::Brush>();
-            textRun.Foreground(brush);
-        }
+        auto g = resources.Lookup(key);
+        auto brush = g.try_as<winrt::Windows::UI::Xaml::Media::Brush>();
+        textRun.Foreground(brush);
     }
 
     return textRun;
@@ -1211,15 +1205,6 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
-    bool TerminalWindow::FocusTab(const winrt::TerminalApp::Tab& tab)
-    {
-        if (_root)
-        {
-            return _root->FocusTab(tab);
-        }
-        return false;
-    }
-
     void TerminalWindow::WindowName(const winrt::hstring& name)
     {
         const auto oldIsQuakeMode = _WindowProperties->IsQuakeWindow();

src/cascadia/TerminalApp/TerminalWindow.h

@@ -92,7 +92,6 @@ namespace winrt::TerminalApp::implementation
         bool ShowTabsFullscreen() const;
         bool AutoHideWindow();
         void IdentifyWindow();
-        bool FocusTab(const winrt::TerminalApp::Tab& tab);
 
         std::optional<uint32_t> LoadPersistedLayoutIdx() const;
         winrt::Microsoft::Terminal::Settings::Model::WindowLayout LoadPersistedLayout();
@@ -222,7 +221,6 @@ namespace winrt::TerminalApp::implementation
         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);
         FORWARDED_TYPED_EVENT(SummonWindowRequested, Windows::Foundation::IInspectable, Windows::Foundation::IInspectable, _root, SummonWindowRequested);
-        FORWARDED_TYPED_EVENT(FocusTabRequested, Windows::Foundation::IInspectable, winrt::TerminalApp::Tab, _root, FocusTabRequested);
         FORWARDED_TYPED_EVENT(OpenSystemMenu, Windows::Foundation::IInspectable, Windows::Foundation::IInspectable, _root, OpenSystemMenu);
         FORWARDED_TYPED_EVENT(QuitRequested, Windows::Foundation::IInspectable, Windows::Foundation::IInspectable, _root, QuitRequested);
         FORWARDED_TYPED_EVENT(ShowWindowChanged, Windows::Foundation::IInspectable, winrt::Microsoft::Terminal::Control::ShowWindowArgs, _root, ShowWindowChanged);

src/cascadia/TerminalApp/TerminalWindow.idl

@@ -4,7 +4,6 @@
 import "IPaneContent.idl";
 import "TerminalPage.idl";
 import "ShortcutActionDispatch.idl";
-import "Tab.idl";
 
 namespace TerminalApp
 {
@@ -75,7 +74,6 @@ namespace TerminalApp
         Boolean ShowTabsFullscreen { get; };
 
         void IdentifyWindow();
-        Boolean FocusTab(TerminalApp.Tab tab);
         void SetPersistedLayoutIdx(UInt32 idx);
         void RequestExitFullscreen();
 
@@ -128,7 +126,6 @@ namespace TerminalApp
         event Windows.Foundation.TypedEventHandler<Object, Object> IdentifyWindowsRequested;
         event Windows.Foundation.TypedEventHandler<Object, Object> IsQuakeWindowChanged;
         event Windows.Foundation.TypedEventHandler<Object, Object> SummonWindowRequested;
-        event Windows.Foundation.TypedEventHandler<Object, TerminalApp.Tab> FocusTabRequested;
         event Windows.Foundation.TypedEventHandler<Object, Object> OpenSystemMenu;
         event Windows.Foundation.TypedEventHandler<Object, Object> QuitRequested;
         event Windows.Foundation.TypedEventHandler<Object, TerminalApp.SystemMenuChangeArgs> SystemMenuChangeRequested;

src/cascadia/TerminalApp/pch.h

@@ -54,9 +54,6 @@
 #include <winrt/Windows.Media.Playback.h>
 #include <winrt/Windows.Management.Deployment.h>
 
-#include <winrt/Windows.UI.Notifications.h>
-#include <winrt/Windows.Data.Xml.Dom.h>
-
 #include <winrt/Microsoft.UI.Xaml.Controls.h>
 #include <winrt/Microsoft.UI.Xaml.Controls.Primitives.h>
 #include <winrt/Microsoft.UI.Xaml.XamlTypeInfo.h>

src/cascadia/TerminalControl/ControlCore.cpp

@@ -925,7 +925,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         // Manually turn off acrylic if they turn off transparency.
         _runtimeUseAcrylic = _settings.Opacity() < 1.0 && _settings.UseAcrylic();
 
-        const auto sizeChanged = _setFontSizeUnderLock(_settings.FontSize() + _accumulatedFontSizeDelta);
+        const auto sizeChanged = _setFontSizeUnderLock(_settings.FontSize());
 
         // Update the terminal core with its new Core settings
         _terminal->UpdateSettings(_settings);
@@ -1163,10 +1163,11 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     // - none
     void ControlCore::ResetFontSize()
     {
-        if (std::exchange(_accumulatedFontSizeDelta, 0.f) != 0.f)
+        const auto lock = _terminal->LockForWriting();
+
+        if (_setFontSizeUnderLock(_settings.FontSize()))
         {
-            // No point in doing this if there was no delta.
-            AdjustFontSize(0);
+            _refreshSizeUnderLock();
         }
     }
 
@@ -1176,11 +1177,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     // - fontSizeDelta: The amount to increase or decrease the font size by.
     void ControlCore::AdjustFontSize(float fontSizeDelta)
     {
-        _accumulatedFontSizeDelta += fontSizeDelta;
-
         const auto lock = _terminal->LockForWriting();
 
-        if (_setFontSizeUnderLock(_settings.FontSize() + _accumulatedFontSizeDelta))
+        if (_setFontSizeUnderLock(_desiredFont.GetFontSize() + fontSizeDelta))
         {
             _refreshSizeUnderLock();
         }

src/cascadia/TerminalControl/ControlCore.h

@@ -391,7 +391,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         bool _colorGlyphs = true;
         CSSLengthPercentage _cellWidth;
         CSSLengthPercentage _cellHeight;
-        float _accumulatedFontSizeDelta = 0.f; // Preserved across reloads to prevent user zoom from being overwritten.
 
         // Rendering stuff.
         winrt::handle _lastSwapChainHandle{ nullptr };

src/cascadia/TerminalControl/ControlInteractivity.cpp

@@ -309,10 +309,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             const auto isOnOriginalPosition = _lastMouseClickPosNoSelection == pixelPosition;
 
             // Rounded coordinates for text selection.
-            // Don't round in VT mouse mode; cell-level precision matters more.
-            // Only round for single-click: for double/triple-click, rounding
-            // can push the position to the next cell, selecting the wrong word.
-            const auto round = multiClickMapper == 1 && !_core->IsVtMouseModeEnabled();
+            // Don't round in VT mouse mode; cell-level precision matters more
+            const auto round = !_core->IsVtMouseModeEnabled();
             _core->LeftClickOnTerminal(_getTerminalPosition(til::point{ pixelPosition }, round),
                                        multiClickMapper,
                                        altEnabled,

src/cascadia/TerminalCore/Terminal.cpp

@@ -98,6 +98,7 @@ void Terminal::UpdateSettings(ICoreSettings settings)
     _answerbackMessage = settings.AnswerbackMessage();
     _wordDelimiters = settings.WordDelimiters();
     _suppressApplicationTitle = settings.SuppressApplicationTitle();
+    _startingTitle = settings.StartingTitle();
     _trimBlockSelection = settings.TrimBlockSelection();
     _autoMarkPrompts = settings.AutoMarkPrompts();
     _rainbowSuggestions = settings.RainbowSuggestions();
@@ -123,11 +124,6 @@ void Terminal::UpdateSettings(ICoreSettings settings)
     // Save the changes made above and in UpdateAppearance as the new default render settings.
     GetRenderSettings().SaveDefaultSettings();
 
-    if (!_startingTitle)
-    {
-        _startingTitle = settings.StartingTitle();
-    }
-
     if (!_startingTabColor && settings.StartingTabColor())
     {
         _startingTabColor = settings.StartingTabColor().Value();

src/cascadia/TerminalCore/Terminal.hpp

@@ -349,7 +349,7 @@ private:
     ::Microsoft::Console::VirtualTerminal::TerminalInput _terminalInput;
 
     std::optional<std::wstring> _title;
-    std::optional<std::wstring> _startingTitle;
+    std::wstring _startingTitle;
     std::optional<til::color> _startingTabColor;
 
     std::vector<til::point_span> _searchHighlights;

src/cascadia/TerminalCore/TerminalApi.cpp

@@ -91,12 +91,8 @@ void Terminal::SetWindowTitle(const std::wstring_view title)
     _assertLocked();
     if (!_suppressApplicationTitle)
     {
-        _title.reset();
-        if (!title.empty())
-        {
-            _title.emplace(title);
-        }
-        _pfnTitleChanged(GetConsoleTitle());
+        _title.emplace(title.empty() ? _startingTitle : title);
+        _pfnTitleChanged(_title.value());
     }
 }
 
@@ -116,13 +112,6 @@ bool Terminal::ResizeWindow(const til::CoordType width, const til::CoordType hei
         return false;
     }
 
-    const auto currentDimensions = _GetMutableViewport().Dimensions();
-
-    if (width == currentDimensions.width && height == currentDimensions.height)
-    {
-        return false;
-    }
-
     if (_pfnWindowSizeChanged)
     {
         _pfnWindowSizeChanged(width, height);

src/cascadia/TerminalCore/terminalrenderdata.cpp

@@ -184,18 +184,11 @@ void Terminal::SelectNewRegion(const til::point coordStart, const til::point coo
 std::wstring_view Terminal::GetConsoleTitle() const noexcept
 {
     _assertLocked();
-
-    if (_title)
+    if (_title.has_value())
     {
         return *_title;
     }
-
-    if (_startingTitle)
-    {
-        return *_startingTitle;
-    }
-
-    return {};
+    return _startingTitle;
 }
 
 // Method Description:

src/cascadia/TerminalSettingsEditor/Actions.cpp

@@ -7,9 +7,7 @@
 #include "LibraryResources.h"
 #include "../TerminalSettingsModel/AllShortcutActions.h"
 
-using namespace winrt::Windows::Foundation;
 using namespace winrt::Windows::UI::Xaml;
-using namespace winrt::Windows::UI::Xaml::Controls;
 using namespace winrt::Windows::UI::Xaml::Navigation;
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
@@ -44,65 +42,4 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
             TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
     }
-
-    // Builds the "view all" flyout lazily on the first click of a
-    // row's "..." button, then caches it on the button so subsequent clicks
-    // just re-show it.
-    void Actions::ViewAllKeyChordsButton_Click(const IInspectable& sender, const RoutedEventArgs& /*e*/)
-    {
-        const auto button = sender.try_as<Button>();
-        if (!button)
-        {
-            return;
-        }
-
-        // Retrieve cached flyout, if possible
-        if (const auto existing = button.Flyout())
-        {
-            existing.ShowAt(button);
-            return;
-        }
-
-        const auto cmdVM = button.DataContext().try_as<Editor::CommandViewModel>();
-        if (!cmdVM)
-        {
-            return;
-        }
-
-        Flyout flyout;
-        flyout.Placement(Primitives::FlyoutPlacementMode::Bottom);
-        flyout.FlyoutPresenterStyle(Resources().Lookup(box_value(L"EdgeToEdgeFlyoutPresenterStyle")).as<winrt::Windows::UI::Xaml::Style>());
-
-        StackPanel content;
-        content.Orientation(Orientation::Vertical);
-        content.MinWidth(120.0);
-
-        if (cmdVM.HasNoKeyChords())
-        {
-            const auto emptyTemplate = Resources().Lookup(box_value(L"ViewAllKeyChordsFlyoutEmptyStateTemplate")).as<DataTemplate>();
-            content.Children().Append(emptyTemplate.LoadContent().as<UIElement>());
-        }
-        else
-        {
-            const auto separatorTemplate = Resources().Lookup(box_value(L"ViewAllKeyChordsFlyoutSeparatorTemplate")).as<DataTemplate>();
-            const auto itemTemplate = Resources().Lookup(box_value(L"ViewAllKeyChordsFlyoutItemTemplate")).as<DataTemplate>();
-            const auto chords = cmdVM.KeyChordList();
-            const auto count = chords.Size();
-            for (uint32_t i = 0; i < count; ++i)
-            {
-                if (i > 0)
-                {
-                    content.Children().Append(separatorTemplate.LoadContent().as<UIElement>());
-                }
-
-                auto chordVisual = itemTemplate.LoadContent().as<Editor::KeyChordVisual>();
-                chordVisual.KeyChord(chords.GetAt(i).CurrentKeys());
-                content.Children().Append(chordVisual);
-            }
-        }
-
-        flyout.Content(content);
-        button.Flyout(flyout);
-        flyout.ShowAt(button);
-    }
 }

src/cascadia/TerminalSettingsEditor/Actions.h

@@ -17,8 +17,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         void OnNavigatedTo(const winrt::Windows::UI::Xaml::Navigation::NavigationEventArgs& e);
 
-        void ViewAllKeyChordsButton_Click(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::UI::Xaml::RoutedEventArgs& e);
-
         til::property_changed_event PropertyChanged;
         WINRT_OBSERVABLE_PROPERTY(Editor::ActionsViewModel, ViewModel, PropertyChanged.raise, nullptr);
 

src/cascadia/TerminalSettingsEditor/Actions.xaml

@@ -8,6 +8,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:local="using:Microsoft.Terminal.Settings.Editor"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:mtu="using:Microsoft.Terminal.UI"
       mc:Ignorable="d">
 
     <Page.Resources>
@@ -16,116 +17,182 @@
                 <ResourceDictionary Source="CommonResources.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
+            <!--  Theme Dictionary  -->
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Dark">
+                    <!--  TextBox colors !  -->
+                    <SolidColorBrush x:Key="TextControlBackground"
+                                     Color="#333333" />
+                    <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush"
+                                     Color="#B5B5B5" />
+                    <SolidColorBrush x:Key="TextControlForeground"
+                                     Color="#B5B5B5" />
+                    <SolidColorBrush x:Key="TextControlBorderBrush"
+                                     Color="#404040" />
+                    <SolidColorBrush x:Key="TextControlButtonForeground"
+                                     Color="#B5B5B5" />
+
+                    <SolidColorBrush x:Key="TextControlBackgroundPointerOver"
+                                     Color="#404040" />
+                    <SolidColorBrush x:Key="TextControlForegroundPointerOver"
+                                     Color="#FFFFFF" />
+                    <SolidColorBrush x:Key="TextControlBorderBrushPointerOver"
+                                     Color="#404040" />
+                    <SolidColorBrush x:Key="TextControlButtonForegroundPointerOver"
+                                     Color="#FF4343" />
+
+                    <SolidColorBrush x:Key="TextControlBackgroundFocused"
+                                     Color="#333333" />
+                    <SolidColorBrush x:Key="TextControlForegroundFocused"
+                                     Color="#FFFFFF" />
+                    <SolidColorBrush x:Key="TextControlBorderBrushFocused"
+                                     Color="#404040" />
+                    <SolidColorBrush x:Key="TextControlButtonForegroundPressed"
+                                     Color="#FFFFFF" />
+                    <SolidColorBrush x:Key="TextControlButtonBackgroundPressed"
+                                     Color="#FF4343" />
+
+                    <!--  KeyChordText styles  -->
+                    <Style x:Key="KeyChordBorderStyle"
+                           TargetType="Border">
+                        <Setter Property="BorderThickness" Value="1" />
+                        <Setter Property="CornerRadius" Value="{StaticResource ControlCornerRadius}" />
+                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
+                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+                    <Style x:Key="KeyChordTextBlockStyle"
+                           TargetType="TextBlock">
+                        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Light">
+                    <!--  TextBox colors !  -->
+                    <SolidColorBrush x:Key="TextControlBackground"
+                                     Color="#CCCCCC" />
+                    <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush"
+                                     Color="#636363" />
+                    <SolidColorBrush x:Key="TextControlBorderBrush"
+                                     Color="#636363" />
+                    <SolidColorBrush x:Key="TextControlButtonForeground"
+                                     Color="#636363" />
+
+                    <SolidColorBrush x:Key="TextControlBackgroundPointerOver"
+                                     Color="#DADADA" />
+                    <SolidColorBrush x:Key="TextControlBorderBrushPointerOver"
+                                     Color="#636363" />
+                    <SolidColorBrush x:Key="TextControlButtonForegroundPointerOver"
+                                     Color="#FF4343" />
+
+                    <SolidColorBrush x:Key="TextControlBackgroundFocused"
+                                     Color="#CCCCCC" />
+                    <SolidColorBrush x:Key="TextControlBorderBrushFocused"
+                                     Color="#636363" />
+                    <SolidColorBrush x:Key="TextControlButtonForegroundPressed"
+                                     Color="#FFFFFF" />
+                    <SolidColorBrush x:Key="TextControlButtonBackgroundPressed"
+                                     Color="#FF4343" />
+
+                    <!--  KeyChordText styles  -->
+                    <Style x:Key="KeyChordBorderStyle"
+                           TargetType="Border">
+                        <Setter Property="BorderThickness" Value="1" />
+                        <Setter Property="BorderThickness" Value="1" />
+                        <Setter Property="CornerRadius" Value="{StaticResource ControlCornerRadius}" />
+                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
+                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+                    <Style x:Key="KeyChordTextBlockStyle"
+                           TargetType="TextBlock">
+                        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="HighContrast">
+
+                    <!--  KeyChordText styles (use XAML defaults for High Contrast theme)  -->
+                    <Style x:Key="KeyChordBorderStyle"
+                           TargetType="Border" />
+                    <Style x:Key="KeyChordTextBlockStyle"
+                           TargetType="TextBlock" />
+
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+
             <!--  Styles  -->
-            <Style x:Key="ActionRowItemContainerStyle"
+            <Style x:Key="KeyBindingContainerStyle"
                    BasedOn="{StaticResource DefaultListViewItemStyle}"
                    TargetType="ListViewItem">
-                <Setter Property="Padding" Value="{StaticResource SettingsCardPadding}" />
-                <Setter Property="MinHeight" Value="{StaticResource SettingsCardMinHeight}" />
-                <Setter Property="Margin" Value="{StaticResource SettingsCardItemMargin}" />
+                <Setter Property="Padding" Value="12,4,4,4" />
                 <Setter Property="HorizontalContentAlignment" Value="Stretch" />
                 <Setter Property="XYFocusKeyboardNavigation" Value="Enabled" />
-                <Setter Property="BorderBrush" Value="{ThemeResource ExpanderHeaderBorderBrush}" />
-                <Setter Property="BorderThickness" Value="{ThemeResource ExpanderHeaderBorderThickness}" />
-                <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
             </Style>
-
-            <Style x:Key="ActionRowNameTextStyle"
+            <Style x:Key="KeyBindingNameTextBlockStyle"
                    BasedOn="{StaticResource BaseTextBlockStyle}"
                    TargetType="TextBlock">
                 <Setter Property="VerticalAlignment" Value="Center" />
-                <Setter Property="FontWeight" Value="Normal" />
                 <Setter Property="TextWrapping" Value="WrapWholeWords" />
             </Style>
-
-            <Style x:Key="ActionRowSubtleButtonStyle"
-                   BasedOn="{StaticResource DefaultButtonStyle}"
-                   TargetType="Button">
-                <Setter Property="MinWidth" Value="32" />
-                <Setter Property="Width" Value="32" />
-                <Setter Property="Height" Value="32" />
-                <Setter Property="Padding" Value="0" />
+            <Style x:Key="KeyChordEditorStyle"
+                   TargetType="local:KeyChordListener">
+                <Setter Property="HorizontalAlignment" Value="Right" />
                 <Setter Property="VerticalAlignment" Value="Center" />
-                <Setter Property="Background" Value="Transparent" />
-                <Setter Property="BorderBrush" Value="Transparent" />
             </Style>
 
-            <!--
-                FlyoutPresenter style with no internal padding so a full-width Border
-                separator inside the flyout can reach the flyout's left/right edges.
-            -->
-            <Style x:Key="EdgeToEdgeFlyoutPresenterStyle"
-                   BasedOn="{StaticResource DefaultFlyoutPresenterStyle}"
-                   TargetType="FlyoutPresenter">
-                <Setter Property="Padding" Value="0" />
-                <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Disabled" />
-                <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
-            </Style>
+            <!--  Converters & Misc.  -->
+            <SolidColorBrush x:Key="ActionContainerBackgroundEditing"
+                             Color="{ThemeResource SystemListMediumColor}" />
+            <SolidColorBrush x:Key="ActionContainerBackground"
+                             Color="Transparent" />
 
             <!--  Templates  -->
-            <DataTemplate x:Key="ViewAllKeyChordsFlyoutSeparatorTemplate">
-                <Border Height="1"
-                        Margin="0,4,0,4"
-                        Background="{ThemeResource DividerStrokeColorDefaultBrush}" />
-            </DataTemplate>
-
-            <DataTemplate x:Key="ViewAllKeyChordsFlyoutEmptyStateTemplate">
-                <TextBlock x:Uid="Actions_NoKeyBindings"
-                           Margin="12,8,12,8"
-                           HorizontalAlignment="Center"
-                           VerticalAlignment="Center"
-                           Style="{StaticResource SecondaryTextBlockStyle}" />
-            </DataTemplate>
-
-            <DataTemplate x:Key="ViewAllKeyChordsFlyoutItemTemplate">
-                <local:KeyChordVisual Margin="{ThemeResource MenuFlyoutItemThemePaddingNarrow}"
-                                      HorizontalAlignment="Right" />
-            </DataTemplate>
-
             <DataTemplate x:Key="CommandTemplate"
                           x:DataType="local:CommandViewModel">
-                <Grid AutomationProperties.Name="{x:Bind DisplayNameAndKeyChordAutomationPropName, Mode=OneWay}"
-                      ColumnSpacing="8">
-                    <Grid.ColumnDefinitions>
-                        <!--  command name  -->
-                        <ColumnDefinition Width="*" />
-                        <!--  key chord  -->
-                        <ColumnDefinition Width="Auto" />
-                        <!--  edit button  -->
-                        <ColumnDefinition Width="Auto" />
-                        <!--  "..." button  -->
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
+                <ListViewItem AutomationProperties.Name="{x:Bind DisplayNameAndKeyChordAutomationPropName, Mode=OneWay}"
+                              Style="{StaticResource KeyBindingContainerStyle}">
+                    <Grid ColumnSpacing="8">
+                        <Grid.ColumnDefinitions>
+                            <!--  command name  -->
+                            <ColumnDefinition Width="*" />
+                            <!--  key chord  -->
+                            <ColumnDefinition Width="auto" />
+                        </Grid.ColumnDefinitions>
 
-                    <!--  Command Name  -->
-                    <TextBlock Grid.Column="0"
-                               Style="{StaticResource ActionRowNameTextStyle}"
-                               Text="{x:Bind DisplayName, Mode=OneWay}" />
-
-                    <!--  Key Chord  -->
-                    <local:KeyChordVisual Grid.Column="1"
-                                          HorizontalAlignment="Right"
-                                          KeyChord="{x:Bind FirstKeyChord, Mode=OneWay}" />
-
-                    <!--  Edit button  -->
-                    <Button x:Uid="Actions_EditButton"
-                            Grid.Column="2"
-                            AutomationProperties.Name="{x:Bind DisplayName, Mode=OneWay}"
-                            Click="{x:Bind Edit_Click}"
-                            Style="{StaticResource ActionRowSubtleButtonStyle}">
-                        <FontIcon FontSize="14"
-                                  Glyph="&#xE70F;" />
-                    </Button>
-
-                    <!--  "..." button + flyout  -->
-                    <Button x:Uid="Actions_ViewAllKeyChordsButton"
-                            Grid.Column="3"
-                            Click="ViewAllKeyChordsButton_Click"
-                            Style="{StaticResource ActionRowSubtleButtonStyle}">
-                        <FontIcon FontSize="14"
-                                  Glyph="&#xE712;" />
-                    </Button>
-                </Grid>
+                        <!--  Command Name  -->
+                        <TextBlock Grid.Column="0"
+                                   FontWeight="Normal"
+                                   Style="{StaticResource KeyBindingNameTextBlockStyle}"
+                                   Text="{x:Bind DisplayName, Mode=OneWay}" />
+                        <!--  Key Chord Text  -->
+                        <Grid Grid.Column="1"
+                              HorizontalAlignment="Right"
+                              VerticalAlignment="Center"
+                              ColumnSpacing="4">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <Border Grid.Column="0"
+                                    Padding="8,4,8,4"
+                                    Style="{ThemeResource KeyChordBorderStyle}"
+                                    Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(FirstKeyChordText)}">
+                                <TextBlock FontSize="14"
+                                           Style="{ThemeResource KeyChordTextBlockStyle}"
+                                           Text="{x:Bind FirstKeyChordText, Mode=OneWay}"
+                                           TextWrapping="WrapWholeWords" />
+                            </Border>
+                            <Border Grid.Column="1"
+                                    Padding="8,4,8,4"
+                                    Style="{ThemeResource KeyChordBorderStyle}"
+                                    ToolTipService.ToolTip="{x:Bind AdditionalKeyChordTooltipText, Mode=OneWay}"
+                                    Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(AdditionalKeyChordCountText)}">
+                                <TextBlock FontSize="14"
+                                           Style="{ThemeResource KeyChordTextBlockStyle}"
+                                           Text="{x:Bind AdditionalKeyChordCountText, Mode=OneWay}" />
+                            </Border>
+                        </Grid>
+                    </Grid>
+                </ListViewItem>
             </DataTemplate>
         </ResourceDictionary>
     </Page.Resources>
@@ -141,8 +208,7 @@
             <!--  Add New Button  -->
             <Button x:Name="AddNewButton"
                     Margin="0,12,0,0"
-                    Click="{x:Bind ViewModel.AddNewCommand}"
-                    Style="{StaticResource AccentButtonStyle}">
+                    Click="{x:Bind ViewModel.AddNewCommand}">
                 <Button.Content>
                     <StackPanel Orientation="Horizontal">
                         <FontIcon FontSize="{StaticResource StandardIconSize}"
@@ -155,42 +221,11 @@
 
             <!--  Commands  -->
             <ListView x:Name="CommandsListView"
+                      Margin="-8,0,0,0"
                       IsItemClickEnabled="True"
                       ItemClick="{x:Bind ViewModel.CmdListItemClicked}"
-                      ItemContainerStyle="{StaticResource ActionRowItemContainerStyle}"
                       ItemTemplate="{StaticResource CommandTemplate}"
-                      ItemsSource="{x:Bind ViewModel.CommandList, Mode=OneWay}"
-                      SelectionMode="None">
-                <!--
-                    The framework ListViewItemPresenter reads its per-state backgrounds
-                    from these theme resources (not from ListViewItem.Background), so we
-                    override them here to match the card chrome on ActionRowItemContainerStyle.
-                -->
-                <ListView.Resources>
-                    <ResourceDictionary>
-                        <ResourceDictionary.ThemeDictionaries>
-                            <ResourceDictionary x:Key="Default">
-                                <StaticResource x:Key="ListViewItemBackground"
-                                                ResourceKey="ExpanderHeaderBackground" />
-                                <StaticResource x:Key="ListViewItemBackgroundPointerOver"
-                                                ResourceKey="ControlFillColorSecondaryBrush" />
-                                <StaticResource x:Key="ListViewItemBackgroundPressed"
-                                                ResourceKey="ControlFillColorTertiaryBrush" />
-                                <StaticResource x:Key="ListViewItemBackgroundSelected"
-                                                ResourceKey="ExpanderHeaderBackground" />
-                                <StaticResource x:Key="ListViewItemBackgroundSelectedPointerOver"
-                                                ResourceKey="ControlFillColorSecondaryBrush" />
-                                <StaticResource x:Key="ListViewItemBackgroundSelectedPressed"
-                                                ResourceKey="ControlFillColorTertiaryBrush" />
-                            </ResourceDictionary>
-                            <ResourceDictionary x:Key="HighContrast">
-                                <StaticResource x:Key="ListViewItemBackground"
-                                                ResourceKey="SystemColorButtonFaceColorBrush" />
-                            </ResourceDictionary>
-                        </ResourceDictionary.ThemeDictionaries>
-                    </ResourceDictionary>
-                </ListView.Resources>
-            </ListView>
+                      ItemsSource="{x:Bind ViewModel.CommandList, Mode=OneWay}" />
         </StackPanel>
     </Border>
 </Page>

src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp

@@ -57,22 +57,13 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             return;
         }
         std::vector<Editor::KeyChordViewModel> keyChordVMs;
-        int32_t idx = 1;
         for (const auto keys : _keyChordList)
         {
-            auto kcVM{ make_self<KeyChordViewModel>(keys) };
-            kcVM->Index(idx++);
-            _RegisterKeyChordVMEvents(*kcVM);
-            keyChordVMs.push_back(*kcVM);
+            auto kcVM{ make<KeyChordViewModel>(keys) };
+            _RegisterKeyChordVMEvents(kcVM);
+            keyChordVMs.push_back(kcVM);
         }
         _KeyChordList = single_threaded_observable_vector(std::move(keyChordVMs));
-        _KeyChordList.VectorChanged([weakThis{ get_weak() }](const auto& /*sender*/, const auto& /*args*/) {
-            if (auto self{ weakThis.get() })
-            {
-                self->_ReindexKeyChordList();
-                self->_NotifyChanges(L"FirstKeyChord", L"FirstKeyChordText", L"AdditionalKeyChordCountText", L"AdditionalKeyChordTooltipText", L"DisplayNameAndKeyChordAutomationPropName");
-            }
-        });
 
         std::vector<hstring> shortcutActions;
         for (const auto [action, name] : _availableActionsAndNamesMap)
@@ -128,7 +119,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return _cachedDisplayName;
     }
 
-    winrt::hstring CommandViewModel::Name() const noexcept
+    winrt::hstring CommandViewModel::Name()
     {
         return _command.HasName() ? _command.Name() : L"";
     }
@@ -154,7 +145,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return result;
     }
 
-    winrt::hstring CommandViewModel::FirstKeyChordText() const
+    winrt::hstring CommandViewModel::FirstKeyChordText()
     {
         if (_KeyChordList.Size() != 0)
         {
@@ -163,21 +154,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return L"";
     }
 
-    Control::KeyChord CommandViewModel::FirstKeyChord() const noexcept
-    {
-        if (_KeyChordList.Size() != 0)
-        {
-            return _KeyChordList.GetAt(0).CurrentKeys();
-        }
-        return nullptr;
-    }
-
-    bool CommandViewModel::HasNoKeyChords() const noexcept
-    {
-        return _KeyChordList.Size() == 0;
-    }
-
-    winrt::hstring CommandViewModel::AdditionalKeyChordCountText() const
+    winrt::hstring CommandViewModel::AdditionalKeyChordCountText()
     {
         const auto size = _KeyChordList.Size();
         if (size > 1)
@@ -187,7 +164,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return L"";
     }
 
-    winrt::hstring CommandViewModel::AdditionalKeyChordTooltipText() const
+    winrt::hstring CommandViewModel::AdditionalKeyChordTooltipText()
     {
         const auto size = _KeyChordList.Size();
         if (size <= 1)
@@ -206,12 +183,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return winrt::hstring{ result };
     }
 
-    winrt::hstring CommandViewModel::ID() const noexcept
+    winrt::hstring CommandViewModel::ID()
     {
         return _command.ID();
     }
 
-    bool CommandViewModel::IsUserAction() const noexcept
+    bool CommandViewModel::IsUserAction()
     {
         return _command.Origin() == OriginTag::User;
     }
@@ -229,40 +206,23 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     void CommandViewModel::AddKeybinding_Click()
     {
         auto kbdVM{ make_self<KeyChordViewModel>(nullptr) };
-        kbdVM->Index(gsl::narrow_cast<int32_t>(_KeyChordList.Size()) + 1);
         kbdVM->IsInEditMode(true);
         _RegisterKeyChordVMEvents(*kbdVM);
         KeyChordList().Append(*kbdVM);
         FocusContainer.raise(*this, *kbdVM);
     }
 
-    // Reassigns 1-based Index values for every KeyChordViewModel in the list. Called
-    // whenever the list changes shape so the per-row "Key Binding #N" label stays in sync.
-    void CommandViewModel::_ReindexKeyChordList()
-    {
-        const auto size = _KeyChordList.Size();
-        for (uint32_t i = 0; i < size; ++i)
-        {
-            auto kcVM{ _KeyChordList.GetAt(i) };
-            const auto newIdx = gsl::narrow_cast<int32_t>(i) + 1;
-            if (kcVM.Index() != newIdx)
-            {
-                kcVM.Index(newIdx);
-            }
-        }
-    }
-
-    winrt::hstring CommandViewModel::ActionNameTextBoxAutomationPropName() const
+    winrt::hstring CommandViewModel::ActionNameTextBoxAutomationPropName()
     {
         return RS_(L"Actions_Name/Text");
     }
 
-    winrt::hstring CommandViewModel::ShortcutActionComboBoxAutomationPropName() const
+    winrt::hstring CommandViewModel::ShortcutActionComboBoxAutomationPropName()
     {
         return RS_(L"Actions_ShortcutAction/Text");
     }
 
-    winrt::hstring CommandViewModel::AdditionalArgumentsControlAutomationPropName() const
+    winrt::hstring CommandViewModel::AdditionalArgumentsControlAutomationPropName()
     {
         return RS_(L"Actions_Arguments/Text");
     }
@@ -313,19 +273,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                         self->FocusContainer.raise(*self, senderVM);
                     }
                 }
-                else if (propertyName == L"KeyChordText")
-                {
-                    // The first chord of the list is what the row visual on the Actions page binds to,
-                    // so propagate the change up so the row updates.
-                    if (self->_KeyChordList.Size() > 0 && self->_KeyChordList.GetAt(0) == senderVM)
-                    {
-                        self->_NotifyChanges(L"FirstKeyChord", L"FirstKeyChordText", L"DisplayNameAndKeyChordAutomationPropName");
-                    }
-                    else
-                    {
-                        self->_NotifyChanges(L"AdditionalKeyChordTooltipText");
-                    }
-                }
             }
         });
     }
@@ -1118,21 +1065,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     KeyChordViewModel::KeyChordViewModel(Control::KeyChord currentKeys)
     {
         CurrentKeys(currentKeys);
-
-        // DisplayLabel is derived from Index, so re-fire the change for it whenever Index changes.
-        PropertyChanged([this](const auto& /*sender*/, const Windows::UI::Xaml::Data::PropertyChangedEventArgs& args) {
-            if (args.PropertyName() == L"Index")
-            {
-                _NotifyChanges(L"DisplayLabel");
-            }
-        });
     }
 
     void KeyChordViewModel::CurrentKeys(const Control::KeyChord& newKeys)
     {
         _currentKeys = newKeys;
         KeyChordText(Model::KeyChordSerialization::ToString(_currentKeys));
-        _NotifyChanges(L"CurrentKeys");
     }
 
     Control::KeyChord KeyChordViewModel::CurrentKeys() const noexcept
@@ -1188,12 +1126,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     hstring KeyChordViewModel::CancelButtonName() const noexcept { return RS_(L"Actions_CancelButton/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip"); }
     hstring KeyChordViewModel::AcceptButtonName() const noexcept { return RS_(L"Actions_AcceptButton/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip"); }
     hstring KeyChordViewModel::DeleteButtonName() const noexcept { return RS_(L"Actions_DeleteButton/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip"); }
-    hstring KeyChordViewModel::EditButtonName() const noexcept { return RS_(L"Actions_EditButton/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip"); }
-
-    winrt::hstring KeyChordViewModel::DisplayLabel() const
-    {
-        return hstring{ RS_fmt(L"EditAction_KeyBindingNumberFormat", _Index) };
-    }
 
     ActionsViewModel::ActionsViewModel(Model::CascadiaSettings settings) :
         _Settings{ settings }
@@ -1402,6 +1334,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             const auto conflictingCmdName{ conflictingCmd.Name() };
             TextBlock conflictingCommandNameTB{};
             conflictingCommandNameTB.Text(fmt::format(L"\"{}\"", conflictingCmdName.empty() ? RS_(L"Actions_UnnamedCommandName") : conflictingCmdName));
+            conflictingCommandNameTB.FontStyle(Windows::UI::Text::FontStyle::Italic);
 
             TextBlock confirmationQuestionTB{};
             confirmationQuestionTB.Text(RS_(L"Actions_RenameConflictConfirmationQuestion"));

src/cascadia/TerminalSettingsEditor/ActionsViewModel.h

@@ -69,18 +69,16 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void Initialize();
 
         winrt::hstring DisplayName();
-        winrt::hstring Name() const noexcept;
+        winrt::hstring Name();
         void Name(const winrt::hstring& newName);
         winrt::hstring DisplayNameAndKeyChordAutomationPropName();
 
-        winrt::hstring FirstKeyChordText() const;
-        Control::KeyChord FirstKeyChord() const noexcept;
-        bool HasNoKeyChords() const noexcept;
-        winrt::hstring AdditionalKeyChordCountText() const;
-        winrt::hstring AdditionalKeyChordTooltipText() const;
+        winrt::hstring FirstKeyChordText();
+        winrt::hstring AdditionalKeyChordCountText();
+        winrt::hstring AdditionalKeyChordTooltipText();
 
-        winrt::hstring ID() const noexcept;
-        bool IsUserAction() const noexcept;
+        winrt::hstring ID();
+        bool IsUserAction();
 
         void Edit_Click();
         til::typed_event<Editor::CommandViewModel, IInspectable> EditRequested;
@@ -91,9 +89,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void AddKeybinding_Click();
 
         // UIA text
-        winrt::hstring ActionNameTextBoxAutomationPropName() const;
-        winrt::hstring ShortcutActionComboBoxAutomationPropName() const;
-        winrt::hstring AdditionalArgumentsControlAutomationPropName() const;
+        winrt::hstring ActionNameTextBoxAutomationPropName();
+        winrt::hstring ShortcutActionComboBoxAutomationPropName();
+        winrt::hstring AdditionalArgumentsControlAutomationPropName();
 
         til::typed_event<IInspectable, Editor::ArgWrapper> PropagateColorSchemeRequested;
         til::typed_event<IInspectable, Editor::ArgWrapper> PropagateColorSchemeNamesRequested;
@@ -117,7 +115,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void _RegisterActionArgsVMEvents(Editor::ActionArgsViewModel actionArgsVM);
         void _ReplaceCommandWithUserCopy(bool reinitialize);
         void _CreateAndInitializeActionArgsVMHelper();
-        void _ReindexKeyChordList();
     };
 
     struct ArgWrapper : ArgWrapperT<ArgWrapper>, ViewModelHelper<ArgWrapper>
@@ -233,19 +230,15 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void CancelChanges();
         void DeleteKeyChord();
 
-        winrt::hstring DisplayLabel() const;
-
         // UIA Text
         hstring CancelButtonName() const noexcept;
         hstring AcceptButtonName() const noexcept;
         hstring DeleteButtonName() const noexcept;
-        hstring EditButtonName() const noexcept;
 
         VIEW_MODEL_OBSERVABLE_PROPERTY(bool, IsInEditMode, false);
         VIEW_MODEL_OBSERVABLE_PROPERTY(Control::KeyChord, ProposedKeys);
         VIEW_MODEL_OBSERVABLE_PROPERTY(winrt::hstring, KeyChordText);
         VIEW_MODEL_OBSERVABLE_PROPERTY(Windows::UI::Xaml::Controls::Flyout, AcceptChangesFlyout, nullptr);
-        VIEW_MODEL_OBSERVABLE_PROPERTY(int32_t, Index, 0);
 
     public:
         til::typed_event<Editor::KeyChordViewModel, Terminal::Control::KeyChord> AddKeyChordRequested;

src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl

@@ -55,8 +55,6 @@ namespace Microsoft.Terminal.Settings.Editor
         // View-model specific
         String DisplayName { get; };
         String FirstKeyChordText { get; };
-        Microsoft.Terminal.Control.KeyChord FirstKeyChord { get; };
-        Boolean HasNoKeyChords { get; };
         String AdditionalKeyChordCountText { get; };
         String AdditionalKeyChordTooltipText { get; };
         String DisplayNameAndKeyChordAutomationPropName { get; };
@@ -140,12 +138,9 @@ namespace Microsoft.Terminal.Settings.Editor
         String KeyChordText { get; };
 
         // UI side
-        Microsoft.Terminal.Control.KeyChord CurrentKeys { get; };
         Microsoft.Terminal.Control.KeyChord ProposedKeys;
         Windows.UI.Xaml.Controls.Flyout AcceptChangesFlyout;
         Boolean IsInEditMode { get; };
-        Int32 Index;
-        String DisplayLabel { get; };
         void ToggleEditMode();
         void AcceptChanges();
         void CancelChanges();
@@ -153,7 +148,6 @@ namespace Microsoft.Terminal.Settings.Editor
         String CancelButtonName { get; };
         String AcceptButtonName { get; };
         String DeleteButtonName { get; };
-        String EditButtonName { get; };
 
         event Windows.Foundation.TypedEventHandler<KeyChordViewModel, Microsoft.Terminal.Control.KeyChord> AddKeyChordRequested;
         event Windows.Foundation.TypedEventHandler<KeyChordViewModel, ModifyKeyChordEventArgs> ModifyKeyChordRequested;

src/cascadia/TerminalSettingsEditor/Appearances.xaml

@@ -68,9 +68,9 @@
     </UserControl.Resources>
 
     <StackPanel>
-        <!--  Section: Typography settings  -->
         <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Appearance_Section_Typography"
+            <!--  Grouping: Text  -->
+            <TextBlock x:Uid="Profile_TextHeader"
                        Margin="0,0,0,4"
                        Style="{StaticResource TextBlockSubHeaderStyle}" />
             <!--  Color Scheme  -->
@@ -81,7 +81,7 @@
                                     CurrentValueAccessibleName="{x:Bind Appearance.CurrentColorScheme.Name, Mode=OneWay}"
                                     HasSettingValue="{x:Bind Appearance.HasDarkColorSchemeName, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.DarkColorSchemeNameOverrideSource, Mode=OneWay}"
-                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                                    Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
                 <local:SettingContainer.CurrentValue>
                     <ComboBox Padding="4"
                               ItemsSource="{x:Bind Appearance.SchemesList, Mode=OneWay}"
@@ -220,7 +220,7 @@
                                                 CurrentValueTemplate="{StaticResource ColorPreviewTemplate}"
                                                 HasSettingValue="{x:Bind Appearance.HasForeground, Mode=OneWay}"
                                                 SettingOverrideSource="{x:Bind Appearance.ForegroundOverrideSource, Mode=OneWay}"
-                                                Style="{StaticResource ExpanderSettingContainerStyle}">
+                                                Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
                             <local:NullableColorPicker x:Uid="Profile_Foreground_NullableColorPicker"
                                                        ColorSchemeVM="{x:Bind Appearance.CurrentColorScheme, Mode=OneWay}"
                                                        CurrentColor="{x:Bind Appearance.Foreground, Mode=TwoWay}"
@@ -236,7 +236,7 @@
                                                 CurrentValueTemplate="{StaticResource ColorPreviewTemplate}"
                                                 HasSettingValue="{x:Bind Appearance.HasBackground, Mode=OneWay}"
                                                 SettingOverrideSource="{x:Bind Appearance.BackgroundOverrideSource, Mode=OneWay}"
-                                                Style="{StaticResource ExpanderSettingContainerStyle}">
+                                                Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
                             <local:NullableColorPicker x:Uid="Profile_Background_NullableColorPicker"
                                                        ColorSchemeVM="{x:Bind Appearance.CurrentColorScheme, Mode=OneWay}"
                                                        CurrentColor="{x:Bind Appearance.Background, Mode=TwoWay}"
@@ -252,7 +252,7 @@
                                                 CurrentValueTemplate="{StaticResource ColorPreviewTemplate}"
                                                 HasSettingValue="{x:Bind Appearance.HasSelectionBackground, Mode=OneWay}"
                                                 SettingOverrideSource="{x:Bind Appearance.SelectionBackgroundOverrideSource, Mode=OneWay}"
-                                                Style="{StaticResource ExpanderSettingContainerStyle}">
+                                                Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
                             <local:NullableColorPicker x:Uid="Profile_SelectionBackground_NullableColorPicker"
                                                        ColorSchemeVM="{x:Bind Appearance.CurrentColorScheme, Mode=OneWay}"
                                                        CurrentColor="{x:Bind Appearance.SelectionBackground, Mode=TwoWay}"
@@ -484,25 +484,13 @@
                           SelectedItem="{x:Bind CurrentAdjustIndistinguishableColors, Mode=TwoWay}"
                           Style="{StaticResource ComboBoxSettingStyle}" />
             </local:SettingContainer>
-
-            <!--  Intense is bold, bright  -->
-            <local:SettingContainer x:Name="IntenseTextStyle"
-                                    x:Uid="Appearance_IntenseTextStyle"
-                                    ClearSettingValue="{x:Bind Appearance.ClearIntenseTextStyle}"
-                                    HasSettingValue="{x:Bind Appearance.HasIntenseTextStyle, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Appearance.IntenseTextStyleOverrideSource, Mode=OneWay}">
-                <ComboBox AutomationProperties.AccessibilityView="Content"
-                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                          ItemsSource="{x:Bind IntenseTextStyleList, Mode=OneWay}"
-                          SelectedItem="{x:Bind CurrentIntenseTextStyle, Mode=TwoWay}"
-                          Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
         </StackPanel>
 
-        <!--  Section: Cursor settings  -->
+        <!--  Grouping: Cursor  -->
         <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Appearance_Section_Cursor"
+            <TextBlock x:Uid="Profile_CursorHeader"
                        Style="{StaticResource TextBlockSubHeaderStyle}" />
+
             <!--  Cursor Shape  -->
             <local:SettingContainer x:Name="CursorShape"
                                     x:Uid="Profile_CursorShape"
@@ -548,7 +536,7 @@
                                     CurrentValueTemplate="{StaticResource ColorPreviewTemplate}"
                                     HasSettingValue="{x:Bind Appearance.HasCursorColor, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.CursorColorOverrideSource, Mode=OneWay}"
-                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                                    Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
                 <local:NullableColorPicker x:Uid="Profile_CursorColor_NullableColorPicker"
                                            ColorSchemeVM="{x:Bind Appearance.CurrentColorScheme, Mode=OneWay}"
                                            CurrentColor="{x:Bind Appearance.CursorColor, Mode=TwoWay}"
@@ -556,10 +544,11 @@
             </local:SettingContainer>
         </StackPanel>
 
-        <!--  Section: Background image  -->
+        <!--  Grouping: Background  -->
         <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Appearance_Section_BackgroundImage"
+            <TextBlock x:Uid="Profile_BackgroundHeader"
                        Style="{StaticResource TextBlockSubHeaderStyle}" />
+
             <!--  Background Image  -->
             <local:SettingContainer x:Name="BackgroundImageContainer"
                                     x:Uid="Profile_BackgroundImage"
@@ -813,5 +802,24 @@
             </local:SettingContainer>
         </StackPanel>
 
+        <!--  Grouping: Text Formatting  -->
+        <StackPanel Style="{StaticResource PivotStackStyle}">
+            <TextBlock x:Uid="Appearance_TextFormattingHeader"
+                       Style="{StaticResource TextBlockSubHeaderStyle}" />
+
+            <!--  Intense is bold, bright  -->
+            <local:SettingContainer x:Name="IntenseTextStyle"
+                                    x:Uid="Appearance_IntenseTextStyle"
+                                    ClearSettingValue="{x:Bind Appearance.ClearIntenseTextStyle}"
+                                    HasSettingValue="{x:Bind Appearance.HasIntenseTextStyle, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Appearance.IntenseTextStyleOverrideSource, Mode=OneWay}">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind IntenseTextStyleList, Mode=OneWay}"
+                          SelectedItem="{x:Bind CurrentIntenseTextStyle, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
+        </StackPanel>
+
     </StackPanel>
 </UserControl>

src/cascadia/TerminalSettingsEditor/CommonResources.xaml

@@ -8,9 +8,8 @@
                     xmlns:mtu="using:Microsoft.Terminal.UI"
                     xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
 
-    <!--  Merge SettingsControls and SettingContainer styles here to give every page access to them  -->
+    <!--  Merge SettingContainerStyle here to give every page access to the SettingContainer  -->
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="SettingsControlsStyle.xaml" />
         <ResourceDictionary Source="SettingContainerStyle.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
@@ -65,7 +64,6 @@
 
     <local:ColorToBrushConverter x:Key="ColorToBrushConverter" />
     <local:ColorToStringConverter x:Key="ColorToStringConverter" />
-    <mtu:StringNotEmptyToVisibilityConverter x:Key="StringNotEmptyToVisibilityConverter" />
 
     <Color x:Key="DeleteButtonColor">Firebrick</Color>
 
@@ -1230,19 +1228,13 @@
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
-                        <StackPanel Grid.Column="0"
-                                    Padding="0,12,0,12"
-                                    VerticalAlignment="Center">
-                            <ContentPresenter x:Name="ContentPresenter"
-                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                              Content="{TemplateBinding Content}"
-                                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                                              ContentTransitions="{TemplateBinding ContentTransitions}" />
-                            <TextBlock Style="{StaticResource SettingsPageItemDescriptionStyle}"
-                                       Text="{Binding Tag, RelativeSource={RelativeSource Mode=TemplatedParent}}"
-                                       Visibility="{Binding Tag, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource StringNotEmptyToVisibilityConverter}}" />
-                        </StackPanel>
+                        <ContentPresenter x:Name="ContentPresenter"
+                                          Grid.Column="0"
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          ContentTransitions="{TemplateBinding ContentTransitions}" />
                         <FontIcon Grid.Column="1"
                                   Margin="20,0,8,0"
                                   HorizontalAlignment="Right"

src/cascadia/TerminalSettingsEditor/Compatibility.cpp

@@ -17,7 +17,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     {
         INITIALIZE_BINDABLE_ENUM_SETTING(TextMeasurement, TextMeasurement, winrt::Microsoft::Terminal::Control::TextMeasurement, L"Globals_TextMeasurement_", L"Text");
         INITIALIZE_BINDABLE_ENUM_SETTING(AmbiguousWidth, AmbiguousWidth, winrt::Microsoft::Terminal::Control::AmbiguousWidth, L"Globals_AmbiguousWidth_", L"Text");
-        INITIALIZE_BINDABLE_ENUM_SETTING(GraphicsAPI, GraphicsAPI, winrt::Microsoft::Terminal::Control::GraphicsAPI, L"Globals_GraphicsAPI_", L"Text");
     }
 
     bool CompatibilityViewModel::DebugFeaturesAvailable() const noexcept

src/cascadia/TerminalSettingsEditor/Compatibility.h

@@ -28,10 +28,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         GETSET_BINDABLE_ENUM_SETTING(TextMeasurement, winrt::Microsoft::Terminal::Control::TextMeasurement, _settings.GlobalSettings().TextMeasurement);
         GETSET_BINDABLE_ENUM_SETTING(AmbiguousWidth, winrt::Microsoft::Terminal::Control::AmbiguousWidth, _settings.GlobalSettings().AmbiguousWidth);
 
-        GETSET_BINDABLE_ENUM_SETTING(GraphicsAPI, winrt::Microsoft::Terminal::Control::GraphicsAPI, _settings.GlobalSettings().GraphicsAPI);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(_settings.GlobalSettings(), DisablePartialInvalidation);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(_settings.GlobalSettings(), SoftwareRendering);
-
     private:
         Model::CascadiaSettings _settings;
     };

src/cascadia/TerminalSettingsEditor/Compatibility.idl

@@ -23,11 +23,6 @@ namespace Microsoft.Terminal.Settings.Editor
 
         IInspectable CurrentAmbiguousWidth;
         Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> AmbiguousWidthList { get; };
-
-        IInspectable CurrentGraphicsAPI;
-        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> GraphicsAPIList { get; };
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, DisablePartialInvalidation);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, SoftwareRendering);
     }
 
     [default_interface] runtimeclass Compatibility : Windows.UI.Xaml.Controls.Page

src/cascadia/TerminalSettingsEditor/Compatibility.xaml

@@ -25,117 +25,83 @@
     </Page.Resources>
 
     <StackPanel Style="{StaticResource SettingsStackStyle}">
-        <!--  Section: Compatibility  -->
-        <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Compatibility_Section_Compatibility"
-                       Margin="0,0,0,4"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
-            <!--  Allow Headless  -->
-            <local:SettingContainer x:Name="AllowHeadless"
-                                    x:Uid="Globals_AllowHeadless">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.AllowHeadless, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Allow Headless  -->
+        <local:SettingContainer x:Name="AllowHeadless"
+                                x:Uid="Globals_AllowHeadless">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.AllowHeadless, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Text Measurement  -->
-            <local:SettingContainer x:Name="TextMeasurement"
-                                    x:Uid="Globals_TextMeasurement">
-                <ComboBox AutomationProperties.AccessibilityView="Content"
-                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                          ItemsSource="{x:Bind ViewModel.TextMeasurementList}"
-                          SelectedItem="{x:Bind ViewModel.CurrentTextMeasurement, Mode=TwoWay}"
-                          Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
+        <!--  Text Measurement  -->
+        <local:SettingContainer x:Name="TextMeasurement"
+                                x:Uid="Globals_TextMeasurement">
+            <ComboBox AutomationProperties.AccessibilityView="Content"
+                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                      ItemsSource="{x:Bind ViewModel.TextMeasurementList}"
+                      SelectedItem="{x:Bind ViewModel.CurrentTextMeasurement, Mode=TwoWay}"
+                      Style="{StaticResource ComboBoxSettingStyle}" />
+        </local:SettingContainer>
 
-            <!--  Ambiguous Width  -->
-            <local:SettingContainer x:Name="AmbiguousWidth"
-                                    x:Uid="Globals_AmbiguousWidth">
-                <ComboBox AutomationProperties.AccessibilityView="Content"
-                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                          ItemsSource="{x:Bind ViewModel.AmbiguousWidthList}"
-                          SelectedItem="{x:Bind ViewModel.CurrentAmbiguousWidth, Mode=TwoWay}"
-                          Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
+        <!--  Ambiguous Width  -->
+        <local:SettingContainer x:Name="AmbiguousWidth"
+                                x:Uid="Globals_AmbiguousWidth">
+            <ComboBox AutomationProperties.AccessibilityView="Content"
+                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                      ItemsSource="{x:Bind ViewModel.AmbiguousWidthList}"
+                      SelectedItem="{x:Bind ViewModel.CurrentAmbiguousWidth, Mode=TwoWay}"
+                      Style="{StaticResource ComboBoxSettingStyle}" />
+        </local:SettingContainer>
 
-            <!--  Debug Features  -->
-            <local:SettingContainer x:Name="DebugFeaturesEnabled"
-                                    x:Uid="Globals_DebugFeaturesEnabled"
-                                    Visibility="{x:Bind ViewModel.DebugFeaturesAvailable}">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.DebugFeaturesEnabled, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Debug Features  -->
+        <local:SettingContainer x:Name="DebugFeaturesEnabled"
+                                x:Uid="Globals_DebugFeaturesEnabled"
+                                Visibility="{x:Bind ViewModel.DebugFeaturesAvailable}">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.DebugFeaturesEnabled, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Reset Application State  -->
-            <local:SettingContainer x:Name="ResetApplicationState"
-                                    x:Uid="Settings_ResetApplicationState">
-                <Button x:Uid="Settings_ResetApplicationStateButton"
-                        Style="{StaticResource DeleteButtonStyle}">
-                    <Button.Flyout>
-                        <Flyout x:Name="ResetCacheFlyout"
-                                FlyoutPresenterStyle="{StaticResource CustomFlyoutPresenterStyle}">
-                            <StackPanel>
-                                <TextBlock x:Uid="Settings_ResetApplicationStateConfirmationMessageHeader"
-                                           Style="{StaticResource CustomFlyoutTextStyle}" />
-                                <TextBlock x:Uid="Settings_ResetApplicationStateConfirmationMessageBody"
-                                           FontWeight="Normal"
-                                           Style="{StaticResource CustomFlyoutTextStyle}" />
-                                <Button x:Uid="Settings_ResetApplicationStateConfirmationButton"
-                                        Click="ResetApplicationStateButton_Click" />
-                            </StackPanel>
-                        </Flyout>
-                    </Button.Flyout>
-                </Button>
-            </local:SettingContainer>
+        <!--  Reset Application State  -->
+        <local:SettingContainer x:Name="ResetApplicationState"
+                                x:Uid="Settings_ResetApplicationState">
+            <Button x:Uid="Settings_ResetApplicationStateButton"
+                    Style="{StaticResource DeleteButtonStyle}">
+                <Button.Flyout>
+                    <Flyout x:Name="ResetCacheFlyout"
+                            FlyoutPresenterStyle="{StaticResource CustomFlyoutPresenterStyle}">
+                        <StackPanel>
+                            <TextBlock x:Uid="Settings_ResetApplicationStateConfirmationMessageHeader"
+                                       Style="{StaticResource CustomFlyoutTextStyle}" />
+                            <TextBlock x:Uid="Settings_ResetApplicationStateConfirmationMessageBody"
+                                       FontWeight="Normal"
+                                       Style="{StaticResource CustomFlyoutTextStyle}" />
+                            <Button x:Uid="Settings_ResetApplicationStateConfirmationButton"
+                                    Click="ResetApplicationStateButton_Click" />
+                        </StackPanel>
+                    </Flyout>
+                </Button.Flyout>
+            </Button>
+        </local:SettingContainer>
 
-            <!--  Reset to Default Settings  -->
-            <local:SettingContainer x:Name="ResetToDefaultSettings"
-                                    x:Uid="Settings_ResetToDefaultSettings">
-                <Button x:Uid="Settings_ResetToDefaultSettingsButton"
-                        Style="{StaticResource DeleteButtonStyle}">
-                    <Button.Flyout>
-                        <Flyout FlyoutPresenterStyle="{StaticResource CustomFlyoutPresenterStyle}">
-                            <StackPanel>
-                                <TextBlock x:Uid="Settings_ResetToDefaultSettingsConfirmationMessageHeader"
-                                           Style="{StaticResource CustomFlyoutTextStyle}" />
-                                <TextBlock x:Uid="Settings_ResetToDefaultSettingsConfirmationMessageBody"
-                                           FontWeight="Normal"
-                                           Style="{StaticResource CustomFlyoutTextStyle}" />
-                                <Button x:Uid="Settings_ResetToDefaultSettingsConfirmationButton"
-                                        Click="{x:Bind ViewModel.ResetToDefaultSettings}" />
-                            </StackPanel>
-                        </Flyout>
-                    </Button.Flyout>
-                </Button>
-            </local:SettingContainer>
-        </StackPanel>
+        <!--  Reset to Default Settings  -->
+        <local:SettingContainer x:Name="ResetToDefaultSettings"
+                                x:Uid="Settings_ResetToDefaultSettings">
+            <Button x:Uid="Settings_ResetToDefaultSettingsButton"
+                    Style="{StaticResource DeleteButtonStyle}">
+                <Button.Flyout>
+                    <Flyout FlyoutPresenterStyle="{StaticResource CustomFlyoutPresenterStyle}">
+                        <StackPanel>
+                            <TextBlock x:Uid="Settings_ResetToDefaultSettingsConfirmationMessageHeader"
+                                       Style="{StaticResource CustomFlyoutTextStyle}" />
+                            <TextBlock x:Uid="Settings_ResetToDefaultSettingsConfirmationMessageBody"
+                                       FontWeight="Normal"
+                                       Style="{StaticResource CustomFlyoutTextStyle}" />
+                            <Button x:Uid="Settings_ResetToDefaultSettingsConfirmationButton"
+                                    Click="{x:Bind ViewModel.ResetToDefaultSettings}" />
+                        </StackPanel>
+                    </Flyout>
+                </Button.Flyout>
+            </Button>
+        </local:SettingContainer>
 
-        <!--  Section: Rendering  -->
-        <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Compatibility_Section_Rendering"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
-            <!--  Graphics API  -->
-            <local:SettingContainer x:Name="GraphicsAPI"
-                                    x:Uid="Globals_GraphicsAPI">
-                <ComboBox AutomationProperties.AccessibilityView="Content"
-                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                          ItemsSource="{x:Bind ViewModel.GraphicsAPIList}"
-                          SelectedItem="{x:Bind ViewModel.CurrentGraphicsAPI, Mode=TwoWay}"
-                          Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
-
-            <!--  Disable Partial Invalidation  -->
-            <local:SettingContainer x:Name="DisablePartialInvalidation"
-                                    x:Uid="Globals_DisablePartialInvalidation">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.DisablePartialInvalidation, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
-
-            <!--  Software Rendering  -->
-            <local:SettingContainer x:Name="SoftwareRendering"
-                                    x:Uid="Globals_SoftwareRendering">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.SoftwareRendering, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
-        </StackPanel>
     </StackPanel>
 </Page>

src/cascadia/TerminalSettingsEditor/ControlSizeTrigger.cpp

@@ -1,139 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "ControlSizeTrigger.h"
-#include "ControlSizeTrigger.g.cpp"
-
-#include <limits>
-
-using namespace winrt::Windows::Foundation;
-using namespace winrt::Windows::UI::Xaml;
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    DependencyProperty ControlSizeTrigger::_CanTriggerProperty{ nullptr };
-    DependencyProperty ControlSizeTrigger::_MinWidthProperty{ nullptr };
-    DependencyProperty ControlSizeTrigger::_MaxWidthProperty{ nullptr };
-    DependencyProperty ControlSizeTrigger::_MinHeightProperty{ nullptr };
-    DependencyProperty ControlSizeTrigger::_MaxHeightProperty{ nullptr };
-    DependencyProperty ControlSizeTrigger::_TargetElementProperty{ nullptr };
-
-    ControlSizeTrigger::ControlSizeTrigger()
-    {
-        _InitializeProperties();
-    }
-
-    void ControlSizeTrigger::_InitializeProperties()
-    {
-        // Defaults mirror the toolkit: trigger is always evaluatable, bounds
-        // are wide open, no target element until one is bound.
-        if (!_CanTriggerProperty)
-        {
-            _CanTriggerProperty = DependencyProperty::Register(
-                L"CanTrigger",
-                xaml_typename<bool>(),
-                xaml_typename<Editor::ControlSizeTrigger>(),
-                PropertyMetadata{ box_value(true), PropertyChangedCallback{ &ControlSizeTrigger::_OnTriggerInputChanged } });
-        }
-        if (!_MinWidthProperty)
-        {
-            _MinWidthProperty = DependencyProperty::Register(
-                L"MinWidth",
-                xaml_typename<double>(),
-                xaml_typename<Editor::ControlSizeTrigger>(),
-                PropertyMetadata{ box_value(0.0), PropertyChangedCallback{ &ControlSizeTrigger::_OnTriggerInputChanged } });
-        }
-        if (!_MaxWidthProperty)
-        {
-            _MaxWidthProperty = DependencyProperty::Register(
-                L"MaxWidth",
-                xaml_typename<double>(),
-                xaml_typename<Editor::ControlSizeTrigger>(),
-                PropertyMetadata{ box_value(std::numeric_limits<double>::infinity()), PropertyChangedCallback{ &ControlSizeTrigger::_OnTriggerInputChanged } });
-        }
-        if (!_MinHeightProperty)
-        {
-            _MinHeightProperty = DependencyProperty::Register(
-                L"MinHeight",
-                xaml_typename<double>(),
-                xaml_typename<Editor::ControlSizeTrigger>(),
-                PropertyMetadata{ box_value(0.0), PropertyChangedCallback{ &ControlSizeTrigger::_OnTriggerInputChanged } });
-        }
-        if (!_MaxHeightProperty)
-        {
-            _MaxHeightProperty = DependencyProperty::Register(
-                L"MaxHeight",
-                xaml_typename<double>(),
-                xaml_typename<Editor::ControlSizeTrigger>(),
-                PropertyMetadata{ box_value(std::numeric_limits<double>::infinity()), PropertyChangedCallback{ &ControlSizeTrigger::_OnTriggerInputChanged } });
-        }
-        if (!_TargetElementProperty)
-        {
-            _TargetElementProperty = DependencyProperty::Register(
-                L"TargetElement",
-                xaml_typename<FrameworkElement>(),
-                xaml_typename<Editor::ControlSizeTrigger>(),
-                PropertyMetadata{ nullptr, PropertyChangedCallback{ &ControlSizeTrigger::_OnTargetElementChanged } });
-        }
-    }
-
-    void ControlSizeTrigger::_OnTriggerInputChanged(const DependencyObject& d, const DependencyPropertyChangedEventArgs& /*e*/)
-    {
-        if (const auto obj{ d.try_as<Editor::ControlSizeTrigger>() })
-        {
-            get_self<ControlSizeTrigger>(obj)->_UpdateTrigger();
-        }
-    }
-
-    void ControlSizeTrigger::_OnTargetElementChanged(const DependencyObject& d, const DependencyPropertyChangedEventArgs& e)
-    {
-        const auto obj{ d.try_as<Editor::ControlSizeTrigger>() };
-        if (!obj)
-        {
-            return;
-        }
-        const auto oldElement = e.OldValue().try_as<FrameworkElement>();
-        const auto newElement = e.NewValue().try_as<FrameworkElement>();
-        get_self<ControlSizeTrigger>(obj)->_UpdateTargetElement(oldElement, newElement);
-    }
-
-    void ControlSizeTrigger::_UpdateTargetElement(const FrameworkElement& /*oldValue*/, const FrameworkElement& newValue)
-    {
-        // Revoking handles both unhooking the previous element and a null `newValue`.
-        _sizeChangedRevoker.revoke();
-        if (newValue)
-        {
-            _sizeChangedRevoker = newValue.SizeChanged(winrt::auto_revoke, [weakThis = get_weak()](auto&&, auto&&) {
-                if (const auto strongThis = weakThis.get())
-                {
-                    strongThis->_UpdateTrigger();
-                }
-            });
-        }
-        _UpdateTrigger();
-    }
-
-    void ControlSizeTrigger::_UpdateTrigger()
-    {
-        const auto target = TargetElement();
-        if (!target || !CanTrigger())
-        {
-            _isActive = false;
-            SetActive(false);
-            return;
-        }
-
-        const auto width = target.ActualWidth();
-        const auto height = target.ActualHeight();
-
-        const bool activate =
-            MinWidth() <= width &&
-            width < MaxWidth() &&
-            MinHeight() <= height &&
-            height < MaxHeight();
-
-        _isActive = activate;
-        SetActive(activate);
-    }
-}

src/cascadia/TerminalSettingsEditor/ControlSizeTrigger.h

@@ -1,64 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
-
-Module Name:
-- ControlSizeTrigger
-
-Abstract:
-- A conditional state trigger that activates based on the size (width and/or
-  height) of a target FrameworkElement. Lets XAML visual states swap based on
-  the live size of a templated part. Ported from the Windows Community Toolkit
-  primitive `CommunityToolkit.WinUI.ControlSizeTrigger`.
-
-  The trigger is "active" when:
-    MinWidth  <= TargetElement.ActualWidth  < MaxWidth   AND
-    MinHeight <= TargetElement.ActualHeight < MaxHeight
-
-  Defaults: MinWidth = MinHeight = 0; MaxWidth = MaxHeight = +inf, which makes
-  the trigger always active unless `CanTrigger` is false or `TargetElement` is
-  null.
-
-Author(s):
-- Carlos Zamora - May 2026 (port from CommunityToolkit.WinUI.ControlSizeTrigger)
-
---*/
-
-#pragma once
-
-#include "ControlSizeTrigger.g.h"
-#include "Utils.h"
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    struct ControlSizeTrigger : ControlSizeTriggerT<ControlSizeTrigger>
-    {
-    public:
-        ControlSizeTrigger();
-
-        bool IsActive() const { return _isActive; }
-
-        DEPENDENCY_PROPERTY(bool, CanTrigger);
-        DEPENDENCY_PROPERTY(double, MinWidth);
-        DEPENDENCY_PROPERTY(double, MaxWidth);
-        DEPENDENCY_PROPERTY(double, MinHeight);
-        DEPENDENCY_PROPERTY(double, MaxHeight);
-        DEPENDENCY_PROPERTY(Windows::UI::Xaml::FrameworkElement, TargetElement);
-
-    private:
-        static void _InitializeProperties();
-        static void _OnTriggerInputChanged(const Windows::UI::Xaml::DependencyObject& d, const Windows::UI::Xaml::DependencyPropertyChangedEventArgs& e);
-        static void _OnTargetElementChanged(const Windows::UI::Xaml::DependencyObject& d, const Windows::UI::Xaml::DependencyPropertyChangedEventArgs& e);
-
-        void _UpdateTargetElement(const Windows::UI::Xaml::FrameworkElement& oldValue, const Windows::UI::Xaml::FrameworkElement& newValue);
-        void _UpdateTrigger();
-
-        Windows::UI::Xaml::FrameworkElement::SizeChanged_revoker _sizeChangedRevoker;
-        bool _isActive{ false };
-    };
-}
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
-{
-    BASIC_FACTORY(ControlSizeTrigger);
-}

src/cascadia/TerminalSettingsEditor/ControlSizeTrigger.idl

@@ -1,30 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-namespace Microsoft.Terminal.Settings.Editor
-{
-    [default_interface] runtimeclass ControlSizeTrigger : Windows.UI.Xaml.StateTriggerBase
-    {
-        ControlSizeTrigger();
-
-        Boolean CanTrigger;
-        static Windows.UI.Xaml.DependencyProperty CanTriggerProperty { get; };
-
-        Double MinWidth;
-        static Windows.UI.Xaml.DependencyProperty MinWidthProperty { get; };
-
-        Double MaxWidth;
-        static Windows.UI.Xaml.DependencyProperty MaxWidthProperty { get; };
-
-        Double MinHeight;
-        static Windows.UI.Xaml.DependencyProperty MinHeightProperty { get; };
-
-        Double MaxHeight;
-        static Windows.UI.Xaml.DependencyProperty MaxHeightProperty { get; };
-
-        Windows.UI.Xaml.FrameworkElement TargetElement;
-        static Windows.UI.Xaml.DependencyProperty TargetElementProperty { get; };
-
-        Boolean IsActive { get; };
-    }
-}

src/cascadia/TerminalSettingsEditor/CornerRadiusFilterConverters.cpp

@@ -1,58 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "CornerRadiusFilterConverters.h"
-#include "CornerRadiusConverter.g.cpp"
-#include "TopCornerRadiusFilterConverter.g.cpp"
-#include "BottomCornerRadiusFilterConverter.g.cpp"
-
-using namespace winrt::Windows::UI::Xaml;
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    winrt::Windows::Foundation::IInspectable CornerRadiusConverter::Convert(const winrt::Windows::Foundation::IInspectable& value, const Interop::TypeName& /*targetType*/, const winrt::Windows::Foundation::IInspectable& /*parameter*/, const hstring& /*language*/)
-    {
-        if (!value)
-        {
-            return value;
-        }
-        const auto cr = unbox_value_or<CornerRadius>(value, CornerRadius{ 0, 0, 0, 0 });
-        return box_value(CornerRadius{ 0, 0, cr.BottomRight, cr.BottomLeft });
-    }
-
-    winrt::Windows::Foundation::IInspectable CornerRadiusConverter::ConvertBack(const winrt::Windows::Foundation::IInspectable& value, const Interop::TypeName& /*targetType*/, const winrt::Windows::Foundation::IInspectable& /*parameter*/, const hstring& /*language*/)
-    {
-        return value;
-    }
-
-    winrt::Windows::Foundation::IInspectable TopCornerRadiusFilterConverter::Convert(const winrt::Windows::Foundation::IInspectable& value, const Interop::TypeName& /*targetType*/, const winrt::Windows::Foundation::IInspectable& /*parameter*/, const hstring& /*language*/)
-    {
-        if (!value)
-        {
-            return value;
-        }
-        const auto cr = unbox_value_or<CornerRadius>(value, CornerRadius{ 0, 0, 0, 0 });
-        return box_value(CornerRadius{ cr.TopLeft, cr.TopRight, 0, 0 });
-    }
-
-    winrt::Windows::Foundation::IInspectable TopCornerRadiusFilterConverter::ConvertBack(const winrt::Windows::Foundation::IInspectable& value, const Interop::TypeName& /*targetType*/, const winrt::Windows::Foundation::IInspectable& /*parameter*/, const hstring& /*language*/)
-    {
-        return value;
-    }
-
-    winrt::Windows::Foundation::IInspectable BottomCornerRadiusFilterConverter::Convert(const winrt::Windows::Foundation::IInspectable& value, const Interop::TypeName& /*targetType*/, const winrt::Windows::Foundation::IInspectable& /*parameter*/, const hstring& /*language*/)
-    {
-        if (!value)
-        {
-            return value;
-        }
-        const auto cr = unbox_value_or<CornerRadius>(value, CornerRadius{ 0, 0, 0, 0 });
-        return box_value(CornerRadius{ 0, 0, cr.BottomRight, cr.BottomLeft });
-    }
-
-    winrt::Windows::Foundation::IInspectable BottomCornerRadiusFilterConverter::ConvertBack(const winrt::Windows::Foundation::IInspectable& value, const Interop::TypeName& /*targetType*/, const winrt::Windows::Foundation::IInspectable& /*parameter*/, const hstring& /*language*/)
-    {
-        return value;
-    }
-}

src/cascadia/TerminalSettingsEditor/CornerRadiusFilterConverters.h

@@ -1,42 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// Licensed under the MIT license.
-
-#pragma once
-
-#include "CornerRadiusConverter.g.h"
-#include "TopCornerRadiusFilterConverter.g.h"
-#include "BottomCornerRadiusFilterConverter.g.h"
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    struct CornerRadiusConverter : CornerRadiusConverterT<CornerRadiusConverter>
-    {
-        CornerRadiusConverter() = default;
-
-        Windows::Foundation::IInspectable Convert(const Windows::Foundation::IInspectable& value, const Windows::UI::Xaml::Interop::TypeName& targetType, const Windows::Foundation::IInspectable& parameter, const hstring& language);
-        Windows::Foundation::IInspectable ConvertBack(const Windows::Foundation::IInspectable& value, const Windows::UI::Xaml::Interop::TypeName& targetType, const Windows::Foundation::IInspectable& parameter, const hstring& language);
-    };
-
-    struct TopCornerRadiusFilterConverter : TopCornerRadiusFilterConverterT<TopCornerRadiusFilterConverter>
-    {
-        TopCornerRadiusFilterConverter() = default;
-
-        Windows::Foundation::IInspectable Convert(const Windows::Foundation::IInspectable& value, const Windows::UI::Xaml::Interop::TypeName& targetType, const Windows::Foundation::IInspectable& parameter, const hstring& language);
-        Windows::Foundation::IInspectable ConvertBack(const Windows::Foundation::IInspectable& value, const Windows::UI::Xaml::Interop::TypeName& targetType, const Windows::Foundation::IInspectable& parameter, const hstring& language);
-    };
-
-    struct BottomCornerRadiusFilterConverter : BottomCornerRadiusFilterConverterT<BottomCornerRadiusFilterConverter>
-    {
-        BottomCornerRadiusFilterConverter() = default;
-
-        Windows::Foundation::IInspectable Convert(const Windows::Foundation::IInspectable& value, const Windows::UI::Xaml::Interop::TypeName& targetType, const Windows::Foundation::IInspectable& parameter, const hstring& language);
-        Windows::Foundation::IInspectable ConvertBack(const Windows::Foundation::IInspectable& value, const Windows::UI::Xaml::Interop::TypeName& targetType, const Windows::Foundation::IInspectable& parameter, const hstring& language);
-    };
-}
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
-{
-    BASIC_FACTORY(CornerRadiusConverter);
-    BASIC_FACTORY(TopCornerRadiusFilterConverter);
-    BASIC_FACTORY(BottomCornerRadiusFilterConverter);
-}

src/cascadia/TerminalSettingsEditor/CornerRadiusFilterConverters.idl

@@ -1,20 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-namespace Microsoft.Terminal.Settings.Editor
-{
-    [default_interface] runtimeclass CornerRadiusConverter : Windows.UI.Xaml.Data.IValueConverter
-    {
-        CornerRadiusConverter();
-    }
-
-    [default_interface] runtimeclass TopCornerRadiusFilterConverter : Windows.UI.Xaml.Data.IValueConverter
-    {
-        TopCornerRadiusFilterConverter();
-    }
-
-    [default_interface] runtimeclass BottomCornerRadiusFilterConverter : Windows.UI.Xaml.Data.IValueConverter
-    {
-        BottomCornerRadiusFilterConverter();
-    }
-}

src/cascadia/TerminalSettingsEditor/EditAction.xaml

@@ -17,11 +17,130 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="CommonResources.xaml" />
             </ResourceDictionary.MergedDictionaries>
+            <!--  Theme Dictionary  -->
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Dark">
+                    <!--  KeyChordText styles  -->
+                    <Style x:Key="KeyChordBorderStyle"
+                           TargetType="Button">
+                        <Setter Property="BorderThickness" Value="1" />
+                        <Setter Property="CornerRadius" Value="1" />
+                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
+                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                        <!--  Override visual states  -->
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="Button">
+                                    <Grid>
+                                        <!--  Define the appearance of the button  -->
+                                        <Border x:Name="border"
+                                                Background="{TemplateBinding Background}"
+                                                BorderBrush="{TemplateBinding BorderBrush}"
+                                                BorderThickness="{TemplateBinding BorderThickness}"
+                                                CornerRadius="{TemplateBinding CornerRadius}">
+                                            <ContentPresenter HorizontalAlignment="Center"
+                                                              VerticalAlignment="Center" />
+                                        </Border>
+                                        <VisualStateManager.VisualStateGroups>
+                                            <VisualStateGroup x:Name="CommonStates">
+                                                <VisualState x:Name="Normal" />
+                                                <VisualState x:Name="PointerOver">
+                                                    <Storyboard>
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="border"
+                                                                                       Storyboard.TargetProperty="Background">
+                                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                    Value="{ThemeResource SystemControlHighlightAccentRevealBackgroundBrush}" />
+                                                        </ObjectAnimationUsingKeyFrames>
+                                                    </Storyboard>
+                                                </VisualState>
+                                                <VisualState x:Name="Pressed" />
+                                                <VisualState x:Name="Disabled" />
+                                            </VisualStateGroup>
+                                        </VisualStateManager.VisualStateGroups>
+                                    </Grid>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                    <Style x:Key="KeyChordTextBlockStyle"
+                           TargetType="TextBlock">
+                        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Light">
+                    <!--  KeyChordText styles  -->
+                    <Style x:Key="KeyChordBorderStyle"
+                           TargetType="Button">
+                        <Setter Property="BorderThickness" Value="1" />
+                        <Setter Property="CornerRadius" Value="1" />
+                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
+                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                        <!--  Override visual states  -->
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="Button">
+                                    <Grid>
+                                        <!--  Define the appearance of the button  -->
+                                        <Border x:Name="border"
+                                                Background="{TemplateBinding Background}"
+                                                BorderBrush="{TemplateBinding BorderBrush}"
+                                                BorderThickness="{TemplateBinding BorderThickness}"
+                                                CornerRadius="{TemplateBinding CornerRadius}">
+                                            <ContentPresenter HorizontalAlignment="Center"
+                                                              VerticalAlignment="Center" />
+                                        </Border>
+                                        <VisualStateManager.VisualStateGroups>
+                                            <VisualStateGroup x:Name="CommonStates">
+                                                <VisualState x:Name="Normal" />
+                                                <VisualState x:Name="PointerOver">
+                                                    <Storyboard>
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="border"
+                                                                                       Storyboard.TargetProperty="Background">
+                                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                    Value="{ThemeResource SystemControlHighlightAccentRevealBackgroundBrush}" />
+                                                        </ObjectAnimationUsingKeyFrames>
+                                                    </Storyboard>
+                                                </VisualState>
+                                                <VisualState x:Name="Pressed" />
+                                                <VisualState x:Name="Disabled" />
+                                            </VisualStateGroup>
+                                        </VisualStateManager.VisualStateGroups>
+                                    </Grid>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                    <Style x:Key="KeyChordTextBlockStyle"
+                           TargetType="TextBlock">
+                        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="HighContrast">
+                    <!--  KeyChordText styles (use XAML defaults for High Contrast theme)  -->
+                    <Style x:Key="KeyChordBorderStyle"
+                           TargetType="Button" />
+                    <Style x:Key="KeyChordTextBlockStyle"
+                           TargetType="TextBlock" />
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+
+            <GridLength x:Key="ArgumentNameWidth">148</GridLength>
 
             <!--  Styles  -->
+            <Style x:Key="KeyBindingContainerStyle"
+                   BasedOn="{StaticResource DefaultListViewItemStyle}"
+                   TargetType="ListViewItem">
+                <Setter Property="Padding" Value="4" />
+                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                <Setter Property="XYFocusKeyboardNavigation" Value="Enabled" />
+            </Style>
+            <Style x:Key="KeyChordEditorStyle"
+                   TargetType="local:KeyChordListener">
+                <Setter Property="HorizontalAlignment" Value="Stretch" />
+                <Setter Property="VerticalAlignment" Value="Center" />
+            </Style>
             <x:Int32 x:Key="EditButtonSize">32</x:Int32>
             <x:Double x:Key="EditButtonIconSize">14</x:Double>
-
             <Style x:Key="EditButtonStyle"
                    BasedOn="{StaticResource DefaultButtonStyle}"
                    TargetType="Button">
@@ -30,7 +149,6 @@
                 <Setter Property="Height" Value="{StaticResource EditButtonSize}" />
                 <Setter Property="Width" Value="{StaticResource EditButtonSize}" />
             </Style>
-
             <Style x:Key="AccentEditButtonStyle"
                    BasedOn="{StaticResource AccentButtonStyle}"
                    TargetType="Button">
@@ -39,63 +157,42 @@
                 <Setter Property="Height" Value="{StaticResource EditButtonSize}" />
                 <Setter Property="Width" Value="{StaticResource EditButtonSize}" />
             </Style>
-
-            <Style x:Key="KeyChordEditorStyle"
-                   TargetType="local:KeyChordListener">
-                <Setter Property="HorizontalAlignment" Value="Stretch" />
-                <Setter Property="VerticalAlignment" Value="Center" />
-                <Setter Property="MinWidth" Value="160" />
+            <Style x:Key="TextBlockGroupingStyle"
+                   BasedOn="{StaticResource BodyStrongTextBlockStyle}"
+                   TargetType="TextBlock">
+                <Setter Property="MaxWidth" Value="{StaticResource StandardControlMaxWidth}" />
+                <Setter Property="Margin" Value="0,0,0,4" />
+                <Setter Property="FontSize" Value="16" />
             </Style>
 
-            <!--
-                Item container for the per-chord ListView. We're hosting a SettingContainer
-                inside each item, so strip the default ListViewItem visuals (padding, border,
-                hover/selection background) so they don't double up.
-            -->
-            <Style x:Key="KeyChordListViewItemStyle"
-                   BasedOn="{StaticResource DefaultListViewItemStyle}"
-                   TargetType="ListViewItem">
-                <Setter Property="Padding" Value="0" />
-                <Setter Property="Margin" Value="0" />
-                <Setter Property="MinHeight" Value="0" />
-                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-                <Setter Property="Background" Value="Transparent" />
-                <Setter Property="BorderThickness" Value="0" />
-            </Style>
-
-            <!--  "Key Binding #N" template  -->
+            <!--  Templates  -->
             <DataTemplate x:Key="KeyChordTemplate"
                           x:DataType="local:KeyChordViewModel">
-                <local:SettingContainer Header="{x:Bind DisplayLabel, Mode=OneWay}">
-                    <Grid VerticalAlignment="Center"
-                          ColumnSpacing="8">
+                <ListViewItem IsTabStop="False"
+                              Style="{StaticResource KeyBindingContainerStyle}">
+                    <Grid Padding="-4,0,0,0"
+                          VerticalAlignment="Center">
                         <Grid.ColumnDefinitions>
-                            <!--  Key visual / key chord listener  -->
+                            <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
                             <ColumnDefinition Width="Auto" />
-                            <!--  Cancel button (visible only in edit mode)  -->
                             <ColumnDefinition Width="Auto" />
-                            <!--  Accept button (visible only in edit mode)  -->
-                            <ColumnDefinition Width="Auto" />
-                            <!--  Edit (pencil) button (visible only NOT in edit mode)  -->
-                            <ColumnDefinition Width="Auto" />
-                            <!--  Delete button  -->
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
-
-                        <!--  Read-only key chord visual  -->
-                        <local:KeyChordVisual Grid.Column="0"
-                                              KeyChord="{x:Bind CurrentKeys, Mode=OneWay}"
-                                              Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(IsInEditMode), Mode=OneWay}" />
-
-                        <!--  Editable key chord listener  -->
+                        <Button Grid.Column="0"
+                                Background="{ThemeResource AppBarItemBackgroundThemeBrush}"
+                                Click="{x:Bind ToggleEditMode}"
+                                Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(IsInEditMode), Mode=OneWay}">
+                            <TextBlock FontSize="14"
+                                       Text="{x:Bind KeyChordText, Mode=OneWay}"
+                                       TextWrapping="WrapWholeWords" />
+                        </Button>
                         <local:KeyChordListener Grid.Column="0"
                                                 Keys="{x:Bind ProposedKeys, Mode=TwoWay}"
                                                 Style="{StaticResource KeyChordEditorStyle}"
                                                 Visibility="{x:Bind IsInEditMode, Mode=OneWay}" />
-
-                        <!--  Cancel changes (edit mode only)  -->
                         <Button x:Uid="Actions_CancelButton"
                                 Grid.Column="1"
+                                Margin="8,0,0,0"
                                 AutomationProperties.Name="{x:Bind CancelButtonName}"
                                 Click="{x:Bind CancelChanges}"
                                 Style="{StaticResource EditButtonStyle}"
@@ -104,9 +201,9 @@
                                       Glyph="&#xE711;" />
                         </Button>
 
-                        <!--  Accept changes (edit mode only)  -->
                         <Button x:Uid="Actions_AcceptButton"
                                 Grid.Column="2"
+                                Margin="8,0,8,0"
                                 AutomationProperties.Name="{x:Bind AcceptButtonName}"
                                 Click="{x:Bind AcceptChanges}"
                                 Flyout="{x:Bind AcceptChangesFlyout, Mode=OneWay}"
@@ -116,19 +213,8 @@
                                       Glyph="&#xE8FB;" />
                         </Button>
 
-                        <!--  Edit button  -->
-                        <Button x:Uid="Actions_EditButton"
-                                Grid.Column="3"
-                                AutomationProperties.Name="{x:Bind EditButtonName}"
-                                Click="{x:Bind ToggleEditMode}"
-                                Style="{StaticResource EditButtonStyle}"
-                                Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(IsInEditMode), Mode=OneWay}">
-                            <FontIcon FontSize="{StaticResource EditButtonIconSize}"
-                                      Glyph="&#xE70F;" />
-                        </Button>
-
-                        <!--  Delete button  -->
-                        <Button Grid.Column="4"
+                        <Button Grid.Column="3"
+                                HorizontalAlignment="Left"
                                 AutomationProperties.Name="{x:Bind DeleteButtonName}"
                                 Style="{StaticResource DeleteSmallButtonStyle}">
                             <Button.Content>
@@ -147,23 +233,25 @@
                             </Button.Flyout>
                         </Button>
                     </Grid>
-                </local:SettingContainer>
+                </ListViewItem>
             </DataTemplate>
 
-            <!--
-                BODGY: Each ArgWrapper DataTemplate below wraps its editor control
-                in a <local:SettingContainer Header="{x:Bind Name}"> rather than sharing a
-                single outer template. This is because a bug in WinUI 2 prevents a
-                ContentPresenter + ContentTemplateSelector pattern from working correctly,
-                resulting in "Microsoft.Terminal.Settings.Editor.ArgWrapper" being shown.
-            -->
-
             <!--  Example shortcut action to test this template: Adjust Opacity  -->
             <!--  Currently that is the only Int32 arg, so just clamp the min/max values according to that  -->
             <DataTemplate x:Key="Int32Template"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <muxc:NumberBox MinWidth="160"
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Text="{x:Bind Name}"
+                               TextWrapping="WrapWholeWords" />
+                    <muxc:NumberBox Grid.Column="1"
+                                    HorizontalAlignment="Stretch"
                                     AutomationProperties.Name="{x:Bind Name}"
                                     LargeChange="1"
                                     Maximum="100"
@@ -171,14 +259,24 @@
                                     SmallChange="10"
                                     Style="{StaticResource NumberBoxSettingStyle}"
                                     Value="{x:Bind UnboxInt32(Value), Mode=TwoWay, BindBack=Int32BindBack}" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Switch To Tab  -->
             <DataTemplate x:Key="UInt32Template"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <muxc:NumberBox MinWidth="160"
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Text="{x:Bind Name}"
+                               TextWrapping="WrapWholeWords" />
+                    <muxc:NumberBox Grid.Column="1"
+                                    HorizontalAlignment="Stretch"
                                     AutomationProperties.Name="{x:Bind Name}"
                                     LargeChange="1"
                                     Maximum="999"
@@ -186,14 +284,24 @@
                                     SmallChange="1"
                                     Style="{StaticResource NumberBoxSettingStyle}"
                                     Value="{x:Bind UnboxUInt32(Value), Mode=TwoWay, BindBack=UInt32BindBack}" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Close Other Tabs  -->
             <DataTemplate x:Key="UInt32OptionalTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <muxc:NumberBox MinWidth="160"
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Text="{x:Bind Name}"
+                               TextWrapping="WrapWholeWords" />
+                    <muxc:NumberBox Grid.Column="1"
+                                    HorizontalAlignment="Stretch"
                                     AutomationProperties.Name="{x:Bind Name}"
                                     LargeChange="1"
                                     Maximum="999"
@@ -201,14 +309,24 @@
                                     SmallChange="1"
                                     Style="{StaticResource NumberBoxSettingStyle}"
                                     Value="{x:Bind UnboxUInt32Optional(Value), Mode=TwoWay, BindBack=UInt32OptionalBindBack}" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Split Pane  -->
             <DataTemplate x:Key="Int32OptionalTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <muxc:NumberBox MinWidth="160"
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Text="{x:Bind Name}"
+                               TextWrapping="WrapWholeWords" />
+                    <muxc:NumberBox Grid.Column="1"
+                                    HorizontalAlignment="Stretch"
                                     AutomationProperties.Name="{x:Bind Name}"
                                     LargeChange="1"
                                     Maximum="999"
@@ -216,14 +334,24 @@
                                     SmallChange="1"
                                     Style="{StaticResource NumberBoxSettingStyle}"
                                     Value="{x:Bind UnboxInt32Optional(Value), Mode=TwoWay, BindBack=Int32OptionalBindBack}" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Adjust Font Size  -->
             <DataTemplate x:Key="FloatTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <muxc:NumberBox MinWidth="160"
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Text="{x:Bind Name}"
+                               TextWrapping="WrapWholeWords" />
+                    <muxc:NumberBox Grid.Column="1"
+                                    HorizontalAlignment="Stretch"
                                     AutomationProperties.Name="{x:Bind Name}"
                                     LargeChange="1"
                                     Maximum="999"
@@ -231,14 +359,24 @@
                                     SmallChange="1"
                                     Style="{StaticResource NumberBoxSettingStyle}"
                                     Value="{x:Bind UnboxFloat(Value), Mode=TwoWay, BindBack=FloatBindBack}" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Split Pane  -->
             <DataTemplate x:Key="SplitSizeTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <muxc:NumberBox MinWidth="160"
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Text="{x:Bind Name}"
+                               TextWrapping="WrapWholeWords" />
+                    <muxc:NumberBox Grid.Column="1"
+                                    HorizontalAlignment="Stretch"
                                     AutomationProperties.Name="{x:Bind Name}"
                                     LargeChange="0.2"
                                     Maximum="1"
@@ -246,95 +384,144 @@
                                     SmallChange="0.1"
                                     Style="{StaticResource NumberBoxSettingStyle}"
                                     Value="{x:Bind UnboxFloat(Value), Mode=TwoWay, BindBack=FloatBindBack}" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Send Input  -->
             <DataTemplate x:Key="StringTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <TextBox MinWidth="248"
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*"
+                                          MinWidth="196" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Text="{x:Bind Name}"
+                               TextWrapping="WrapWholeWords" />
+                    <TextBox Grid.Column="1"
                              AutomationProperties.Name="{x:Bind Name}"
                              Text="{x:Bind UnboxString(Value), Mode=TwoWay, BindBack=StringBindBack}"
                              TextWrapping="Wrap" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Set Color Scheme  -->
             <DataTemplate x:Key="ColorSchemeTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <ComboBox MinWidth="248"
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Text="{x:Bind Name}"
+                               TextWrapping="WrapWholeWords" />
+                    <ComboBox Grid.Column="1"
+                              HorizontalAlignment="Stretch"
                               AutomationProperties.Name="{x:Bind Name}"
                               ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                               ItemsSource="{x:Bind EnumList, Mode=OneWay}"
                               SelectedItem="{x:Bind EnumValue, Mode=TwoWay}"
                               Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Export Buffer  -->
             <DataTemplate x:Key="FilePickerTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <Grid ColumnSpacing="4">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*"
-                                              MinWidth="196" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <TextBox Grid.Column="0"
-                                 AutomationProperties.Name="{x:Bind Name}"
-                                 Text="{x:Bind UnboxString(Value), Mode=TwoWay, BindBack=StringBindBack}"
-                                 TextWrapping="Wrap" />
-                        <Button x:Uid="Actions_Browse"
-                                Grid.Column="1"
-                                Click="{x:Bind BrowseForFile_Click}"
-                                Style="{StaticResource BrowseButtonStyle}" />
-                    </Grid>
-                </local:SettingContainer>
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*"
+                                          MinWidth="196" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Text="{x:Bind Name}"
+                               TextWrapping="WrapWholeWords" />
+                    <TextBox Grid.Column="1"
+                             AutomationProperties.Name="{x:Bind Name}"
+                             Text="{x:Bind UnboxString(Value), Mode=TwoWay, BindBack=StringBindBack}"
+                             TextWrapping="Wrap" />
+                    <Button x:Uid="Actions_Browse"
+                            Grid.Column="2"
+                            Click="{x:Bind BrowseForFile_Click}"
+                            Style="{StaticResource BrowseButtonStyle}" />
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: New Tab  -->
             <DataTemplate x:Key="FolderPickerTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <Grid ColumnSpacing="4">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*"
-                                              MinWidth="196" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <TextBox Grid.Column="0"
-                                 AutomationProperties.Name="{x:Bind Name}"
-                                 Text="{x:Bind UnboxString(Value), Mode=TwoWay, BindBack=StringBindBack}"
-                                 TextWrapping="Wrap" />
-                        <Button x:Uid="Actions_Browse"
-                                Grid.Column="1"
-                                Click="{x:Bind BrowseForFolder_Click}"
-                                Style="{StaticResource BrowseButtonStyle}" />
-                    </Grid>
-                </local:SettingContainer>
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*"
+                                          MinWidth="196" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Text="{x:Bind Name}"
+                               TextWrapping="WrapWholeWords" />
+                    <TextBox Grid.Column="1"
+                             AutomationProperties.Name="{x:Bind Name}"
+                             Text="{x:Bind UnboxString(Value), Mode=TwoWay, BindBack=StringBindBack}"
+                             TextWrapping="Wrap" />
+                    <Button x:Uid="Actions_Browse"
+                            Grid.Column="2"
+                            Click="{x:Bind BrowseForFolder_Click}"
+                            Style="{StaticResource BrowseButtonStyle}" />
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Set Focus Mode  -->
             <DataTemplate x:Key="BoolTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <ToggleSwitch AutomationProperties.Name="{x:Bind Name}"
-                                  IsOn="{x:Bind UnboxBool(Value), Mode=TwoWay, BindBack=BoolOptionalBindBack}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Text="{x:Bind Name}"
+                               TextWrapping="WrapWholeWords" />
+                    <ToggleSwitch Grid.Column="1"
+                                  HorizontalAlignment="Left"
+                                  AutomationProperties.Name="{x:Bind Name}"
+                                  IsOn="{x:Bind UnboxBool(Value), Mode=TwoWay, BindBack=BoolOptionalBindBack}" />
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Split Pane  -->
             <DataTemplate x:Key="BoolOptionalTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <CheckBox AutomationProperties.Name="{x:Bind Name}"
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Text="{x:Bind Name}"
+                               TextWrapping="WrapWholeWords" />
+                    <CheckBox Grid.Column="1"
+                              HorizontalAlignment="Left"
+                              AutomationProperties.Name="{x:Bind Name}"
                               IsChecked="{x:Bind UnboxBoolOptional(Value), Mode=TwoWay, BindBack=BoolOptionalBindBack}"
                               IsThreeState="True" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Resize Pane  -->
@@ -345,14 +532,24 @@
 
             <DataTemplate x:Key="EnumTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <ComboBox MinWidth="248"
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Text="{x:Bind Name}"
+                               TextWrapping="WrapWholeWords" />
+                    <ComboBox Grid.Column="1"
+                              HorizontalAlignment="Stretch"
                               AutomationProperties.Name="{x:Bind Name}"
                               ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                               ItemsSource="{x:Bind EnumList, Mode=OneWay}"
                               SelectedItem="{x:Bind EnumValue, Mode=TwoWay}"
                               Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Copy Text  -->
@@ -375,35 +572,66 @@
 
             <DataTemplate x:Key="FlagTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <ItemsControl AutomationProperties.Name="{x:Bind Name}"
+                <Grid Margin="0,4,0,4">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Text="{x:Bind Name}"
+                               TextWrapping="WrapWholeWords" />
+                    <ItemsControl Grid.Column="1"
+                                  Margin="0"
+                                  HorizontalAlignment="Left"
+                                  AutomationProperties.Name="{x:Bind Name}"
                                   ItemTemplate="{StaticResource FlagItemTemplate}"
                                   ItemsSource="{x:Bind FlagList, Mode=OneWay}" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Add Mark  -->
             <DataTemplate x:Key="TerminalCoreColorOptionalTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Text="{x:Bind Name}"
+                               TextWrapping="WrapWholeWords" />
                     <local:NullableColorPicker x:Uid="Actions_NullableColorPicker"
+                                               Grid.Column="1"
                                                AutomationProperties.Name="{x:Bind Name}"
                                                ColorSchemeVM="{x:Bind DefaultColorScheme, Mode=OneWay}"
                                                CurrentColor="{x:Bind UnboxTerminalCoreColorOptional(Value), Mode=TwoWay, BindBack=TerminalCoreColorBindBack}"
                                                NullColorPreview="{x:Bind DefaultColorScheme.ForegroundColor.Color, Mode=OneWay}" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Set Tab Color  -->
             <DataTemplate x:Key="WindowsUIColorOptionalTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Text="{x:Bind Name}"
+                               TextWrapping="WrapWholeWords" />
                     <local:NullableColorPicker x:Uid="Actions_NullableColorPicker"
+                                               Grid.Column="1"
                                                AutomationProperties.Name="{x:Bind Name}"
                                                ColorSchemeVM="{x:Bind DefaultColorScheme, Mode=OneWay}"
                                                CurrentColor="{x:Bind UnboxWindowsUIColorOptional(Value), Mode=TwoWay, BindBack=WindowsUIColorBindBack}"
                                                NullColorPreview="{x:Bind DefaultColorScheme.ForegroundColor.Color, Mode=OneWay}" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <local:ArgsTemplateSelectors x:Key="ArgsTemplateSelector"
@@ -427,106 +655,122 @@
         </ResourceDictionary>
     </Page.Resources>
 
-    <Border MaxWidth="{StaticResource StandardControlMaxWidth}">
-        <StackPanel HorizontalAlignment="Stretch"
-                    Style="{StaticResource SettingsStackStyle}">
-
-            <!--  Action type (top-most setting on the page)  -->
-            <local:SettingContainer x:Name="ActionType"
-                                    x:Uid="EditAction_ActionType">
-                <AutoSuggestBox x:Name="ShortcutActionBox"
-                                MinWidth="248"
-                                AutomationProperties.Name="{x:Bind ViewModel.ShortcutActionComboBoxAutomationPropName}"
-                                GotFocus="ShortcutActionBox_GotFocus"
-                                LostFocus="ShortcutActionBox_LostFocus"
-                                QuerySubmitted="ShortcutActionBox_QuerySubmitted"
-                                TextChanged="ShortcutActionBox_TextChanged" />
-            </local:SettingContainer>
-
-            <!--  Key bindings expander  -->
-            <local:SettingContainer x:Name="KeyBindingsContainer"
-                                    x:Uid="EditAction_KeyBindings"
-                                    StartExpanded="{x:Bind mtu:Converters.InvertBoolean(ViewModel.HasNoKeyChords), Mode=OneWay}"
-                                    Style="{StaticResource ExpanderSettingContainerStyle}">
-                <StackPanel>
-                    <!--  "New key binding" button  -->
-                    <local:SettingContainer x:Name="NewKeyBinding"
-                                            x:Uid="EditAction_NewKeyBinding">
-                        <Button x:Uid="EditAction_AddKeyBinding"
-                                Click="{x:Bind ViewModel.AddKeybinding_Click}"
-                                Style="{StaticResource AccentButtonStyle}" />
-                    </local:SettingContainer>
-
-                    <!--  Existing key bindings, one container per chord  -->
-                    <ListView x:Name="KeyChordListView"
-                              x:Uid="Actions_KeyBindingsListView"
-                              HorizontalAlignment="Stretch"
-                              HorizontalContentAlignment="Stretch"
-                              IsItemClickEnabled="False"
-                              ItemContainerStyle="{StaticResource KeyChordListViewItemStyle}"
-                              ItemTemplate="{StaticResource KeyChordTemplate}"
-                              ItemsSource="{x:Bind ViewModel.KeyChordList, Mode=OneWay}"
-                              SelectionMode="None" />
-                </StackPanel>
-            </local:SettingContainer>
-
-            <!--  Additional customizations expander  -->
-            <local:SettingContainer x:Name="AdditionalCustomizations"
-                                    x:Uid="EditAction_AdditionalCustomizations"
-                                    Style="{StaticResource ExpanderSettingContainerStyle}">
-                <StackPanel>
-                    <!--  Action name  -->
-                    <local:SettingContainer x:Name="ActionName"
-                                            x:Uid="EditAction_ActionName">
-                        <TextBox x:Name="CommandNameTextBox"
-                                 MinWidth="248"
-                                 AutomationProperties.Name="{x:Bind ViewModel.ActionNameTextBoxAutomationPropName}"
-                                 PlaceholderText="{x:Bind ViewModel.DisplayName, Mode=OneWay}"
-                                 Text="{x:Bind ViewModel.Name, Mode=TwoWay}" />
-                    </local:SettingContainer>
-
-                    <!--  Action argument controls  -->
-                    <ItemsControl HorizontalAlignment="Stretch"
-                                  HorizontalContentAlignment="Stretch"
-                                  AutomationProperties.Name="{x:Bind ViewModel.AdditionalArgumentsControlAutomationPropName}"
-                                  IsTabStop="False"
-                                  ItemTemplateSelector="{StaticResource ArgsTemplateSelector}"
-                                  ItemsSource="{x:Bind ViewModel.ActionArgsVM.ArgValues, Mode=OneWay}">
-                        <ItemsControl.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <StackPanel HorizontalAlignment="Stretch" />
-                            </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
-                    </ItemsControl>
-                </StackPanel>
-            </local:SettingContainer>
-
-            <!--  Delete command button  -->
-            <local:SettingContainer x:Name="DeleteCommand"
-                                    x:Uid="EditAction_DeleteCommand">
-                <Button IsEnabled="{x:Bind ViewModel.IsUserAction, Mode=OneWay}"
-                        Style="{StaticResource DeleteButtonStyle}">
-                    <Button.Content>
-                        <StackPanel Orientation="Horizontal">
-                            <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                      Glyph="&#xE74D;" />
-                            <TextBlock x:Uid="Actions_DeleteButton2"
-                                       Style="{StaticResource IconButtonTextBlockStyle}" />
+    <Border MaxWidth="{StaticResource StandardControlMaxWidth}"
+            Margin="{StaticResource SettingStackMargin}">
+        <Grid Margin="{StaticResource SettingStackMargin}"
+              HorizontalAlignment="Stretch">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <TextBlock x:Uid="Actions_CommandDetails"
+                       Grid.Row="0"
+                       Grid.Column="0"
+                       Grid.ColumnSpan="2"
+                       Margin="0,0,0,12"
+                       VerticalAlignment="Center"
+                       Style="{StaticResource TextBlockGroupingStyle}" />
+            <TextBlock x:Uid="Actions_Name"
+                       Grid.Row="1"
+                       Grid.Column="0"
+                       Margin="0,0,0,8"
+                       VerticalAlignment="Center" />
+            <TextBox x:Name="CommandNameTextBox"
+                     Grid.Row="1"
+                     Grid.Column="1"
+                     Margin="0,0,0,8"
+                     HorizontalAlignment="Stretch"
+                     AutomationProperties.Name="{x:Bind ViewModel.ActionNameTextBoxAutomationPropName}"
+                     PlaceholderText="{x:Bind ViewModel.DisplayName, Mode=OneWay}"
+                     Text="{x:Bind ViewModel.Name, Mode=TwoWay}" />
+            <TextBlock x:Uid="Actions_ShortcutAction"
+                       Grid.Row="2"
+                       Grid.Column="0"
+                       Margin="0,0,0,12"
+                       VerticalAlignment="Center" />
+            <AutoSuggestBox x:Name="ShortcutActionBox"
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            Margin="0,0,0,12"
+                            VerticalAlignment="Center"
+                            AutomationProperties.Name="{x:Bind ViewModel.ShortcutActionComboBoxAutomationPropName}"
+                            GotFocus="ShortcutActionBox_GotFocus"
+                            LostFocus="ShortcutActionBox_LostFocus"
+                            QuerySubmitted="ShortcutActionBox_QuerySubmitted"
+                            TextChanged="ShortcutActionBox_TextChanged" />
+            <TextBlock x:Uid="Actions_Keybindings"
+                       Grid.Row="3"
+                       Grid.Column="0"
+                       Grid.ColumnSpan="2"
+                       Margin="0,0,0,12"
+                       VerticalAlignment="Center"
+                       Style="{StaticResource TextBlockGroupingStyle}" />
+            <ListView x:Name="KeyChordListView"
+                      x:Uid="Actions_KeyBindingsListView"
+                      Grid.Row="4"
+                      Grid.Column="0"
+                      Grid.ColumnSpan="2"
+                      Margin="0,0,0,12"
+                      ItemTemplate="{StaticResource KeyChordTemplate}"
+                      ItemsSource="{x:Bind ViewModel.KeyChordList, Mode=OneWay}"
+                      SelectionMode="None">
+                <ListView.Footer>
+                    <Button Margin="0,4,0,0"
+                            Click="{x:Bind ViewModel.AddKeybinding_Click}">
+                        <TextBlock x:Uid="Actions_AddKeyChord" />
+                    </Button>
+                </ListView.Footer>
+            </ListView>
+            <TextBlock x:Uid="Actions_Arguments"
+                       Grid.Row="5"
+                       Grid.Column="0"
+                       Grid.ColumnSpan="2"
+                       Margin="0,0,0,12"
+                       VerticalAlignment="Center"
+                       Style="{StaticResource TextBlockGroupingStyle}"
+                       Visibility="{x:Bind ViewModel.ActionArgsVM.HasArgs, Mode=OneWay}" />
+            <ItemsControl Grid.Row="6"
+                          Grid.Column="0"
+                          Grid.ColumnSpan="2"
+                          Margin="0,0,0,12"
+                          HorizontalAlignment="Stretch"
+                          AutomationProperties.Name="{x:Bind ViewModel.AdditionalArgumentsControlAutomationPropName}"
+                          IsTabStop="False"
+                          ItemTemplateSelector="{StaticResource ArgsTemplateSelector}"
+                          ItemsSource="{x:Bind ViewModel.ActionArgsVM.ArgValues, Mode=OneWay}" />
+            <Button Grid.Row="7"
+                    Grid.Column="0"
+                    IsEnabled="{x:Bind ViewModel.IsUserAction, Mode=OneWay}"
+                    Style="{StaticResource DeleteButtonStyle}">
+                <Button.Content>
+                    <StackPanel Orientation="Horizontal">
+                        <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                  Glyph="&#xE74D;" />
+                        <TextBlock x:Uid="Actions_DeleteButton2"
+                                   Style="{StaticResource IconButtonTextBlockStyle}" />
+                    </StackPanel>
+                </Button.Content>
+                <Button.Flyout>
+                    <Flyout>
+                        <StackPanel>
+                            <TextBlock x:Uid="Actions_CommandDeleteConfirmationMessage"
+                                       Style="{StaticResource CustomFlyoutTextStyle}" />
+                            <Button x:Uid="Actions_CommandDeleteConfirmationButton"
+                                    Click="{x:Bind ViewModel.Delete_Click}" />
                         </StackPanel>
-                    </Button.Content>
-                    <Button.Flyout>
-                        <Flyout>
-                            <StackPanel>
-                                <TextBlock x:Uid="Actions_CommandDeleteConfirmationMessage"
-                                           Style="{StaticResource CustomFlyoutTextStyle}" />
-                                <Button x:Uid="Actions_CommandDeleteConfirmationButton"
-                                        Click="{x:Bind ViewModel.Delete_Click}" />
-                            </StackPanel>
-                        </Flyout>
-                    </Button.Flyout>
-                </Button>
-            </local:SettingContainer>
-
-        </StackPanel>
+                    </Flyout>
+                </Button.Flyout>
+            </Button>
+        </Grid>
     </Border>
 </Page>

src/cascadia/TerminalSettingsEditor/Extensions.cpp

@@ -79,7 +79,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Extensions::ExtensionNavigator_Click(const IInspectable& sender, const RoutedEventArgs& /*args*/)
     {
-        const auto extPkgVM = sender.as<FrameworkElement>().Tag().as<Editor::ExtensionPackageViewModel>();
+        const auto extPkgVM = sender.as<Controls::Button>().Tag().as<Editor::ExtensionPackageViewModel>();
         _ViewModel.CurrentExtensionPackage(extPkgVM);
     }
 

src/cascadia/TerminalSettingsEditor/Extensions.xaml

@@ -19,6 +19,12 @@
                 <ResourceDictionary Source="CommonResources.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
+            <Style x:Key="ItalicDisclaimerStyle"
+                   BasedOn="{StaticResource DisclaimerStyle}"
+                   TargetType="TextBlock">
+                <Setter Property="FontStyle" Value="Italic" />
+            </Style>
+
             <Style x:Key="CodeBlockStyle"
                    TargetType="TextBlock">
                 <Setter Property="FontFamily" Value="Cascadia Mono, Consolas" />
@@ -121,58 +127,78 @@
 
             <DataTemplate x:Key="DefaultExtensionNavigatorTemplate"
                           x:DataType="local:ExtensionPackageViewModel">
-                <local:SettingsCard AutomationProperties.Name="{x:Bind AccessibleName}"
-                                    Click="ExtensionNavigator_Click"
-                                    Header="{x:Bind Package.Source}"
-                                    IsClickEnabled="True"
-                                    Tag="{x:Bind}">
-                    <local:SettingsCard.HeaderIcon>
-                        <FontIcon Glyph="&#xE74C;" />
-                    </local:SettingsCard.HeaderIcon>
-                    <ToggleSwitch HorizontalAlignment="Right"
-                                  VerticalAlignment="Center"
-                                  AutomationProperties.Name="{x:Bind AccessibleName}"
-                                  IsOn="{x:Bind Enabled, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingsCard>
+                <Button AutomationProperties.Name="{x:Bind AccessibleName}"
+                        Click="ExtensionNavigator_Click"
+                        Style="{StaticResource NavigatorButtonStyle}"
+                        Tag="{x:Bind}">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <ContentPresenter Content="{x:Bind}"
+                                          ContentTemplate="{StaticResource DefaultExtensionIdentifierTemplate}" />
+
+                        <ToggleSwitch Grid.Column="1"
+                                      HorizontalAlignment="Right"
+                                      VerticalAlignment="Center"
+                                      AutomationProperties.Name="{x:Bind AccessibleName}"
+                                      IsOn="{x:Bind Enabled, Mode=TwoWay}"
+                                      Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+
+                    </Grid>
+                </Button>
             </DataTemplate>
 
             <DataTemplate x:Key="ComplexExtensionNavigatorTemplate"
                           x:DataType="local:ExtensionPackageViewModel">
-                <local:SettingsCard AutomationProperties.Name="{x:Bind AccessibleName}"
-                                    Click="ExtensionNavigator_Click"
-                                    Description="{x:Bind Package.Source}"
-                                    Header="{x:Bind Package.DisplayName}"
-                                    IsClickEnabled="True"
-                                    Tag="{x:Bind}">
-                    <local:SettingsCard.HeaderIcon>
-                        <IconSourceElement IconSource="{x:Bind mtu:IconPathConverter.IconSourceWUX(Package.Icon)}" />
-                    </local:SettingsCard.HeaderIcon>
-                    <ToggleSwitch HorizontalAlignment="Right"
-                                  VerticalAlignment="Center"
-                                  AutomationProperties.Name="{x:Bind AccessibleName}"
-                                  IsOn="{x:Bind Enabled, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingsCard>
+                <Button AutomationProperties.Name="{x:Bind AccessibleName}"
+                        Click="ExtensionNavigator_Click"
+                        Style="{StaticResource NavigatorButtonStyle}"
+                        Tag="{x:Bind}">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <ContentPresenter Content="{x:Bind}"
+                                          ContentTemplate="{StaticResource ComplexExtensionIdentifierTemplate}" />
+
+                        <ToggleSwitch Grid.Column="1"
+                                      HorizontalAlignment="Right"
+                                      VerticalAlignment="Center"
+                                      AutomationProperties.Name="{x:Bind AccessibleName}"
+                                      IsOn="{x:Bind Enabled, Mode=TwoWay}"
+                                      Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+                    </Grid>
+                </Button>
             </DataTemplate>
 
             <DataTemplate x:Key="ComplexExtensionNavigatorTemplateWithFontIcon"
                           x:DataType="local:ExtensionPackageViewModel">
-                <local:SettingsCard AutomationProperties.Name="{x:Bind AccessibleName}"
-                                    Click="ExtensionNavigator_Click"
-                                    Description="{x:Bind Package.Source}"
-                                    Header="{x:Bind Package.DisplayName}"
-                                    IsClickEnabled="True"
-                                    Tag="{x:Bind}">
-                    <local:SettingsCard.HeaderIcon>
-                        <FontIcon Glyph="{x:Bind Package.Icon}" />
-                    </local:SettingsCard.HeaderIcon>
-                    <ToggleSwitch HorizontalAlignment="Right"
-                                  VerticalAlignment="Center"
-                                  AutomationProperties.Name="{x:Bind AccessibleName}"
-                                  IsOn="{x:Bind Enabled, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingsCard>
+                <Button AutomationProperties.Name="{x:Bind AccessibleName}"
+                        Click="ExtensionNavigator_Click"
+                        Style="{StaticResource NavigatorButtonStyle}"
+                        Tag="{x:Bind}">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <ContentPresenter Content="{x:Bind}"
+                                          ContentTemplate="{StaticResource ComplexExtensionIdentifierTemplateWithFontIcon}" />
+
+                        <ToggleSwitch Grid.Column="1"
+                                      HorizontalAlignment="Right"
+                                      VerticalAlignment="Center"
+                                      AutomationProperties.Name="{x:Bind AccessibleName}"
+                                      IsOn="{x:Bind Enabled, Mode=TwoWay}"
+                                      Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+                    </Grid>
+                </Button>
             </DataTemplate>
 
             <DataTemplate x:Key="FragmentProfileViewModelTemplate"
@@ -476,11 +502,9 @@
                         <!--  Scope  -->
                         <local:SettingContainer x:Name="Scope"
                                                 x:Uid="Extensions_Scope"
-                                                IsTabStop="False">
-                            <TextBlock VerticalAlignment="Center"
-                                       Style="{ThemeResource SecondaryTextBlockStyle}"
-                                       Text="{x:Bind ViewModel.CurrentExtensionPackage.Scope, Mode=OneWay}" />
-                        </local:SettingContainer>
+                                                Content="{x:Bind ViewModel.CurrentExtensionPackage.Scope, Mode=OneWay}"
+                                                IsTabStop="False"
+                                                Style="{StaticResource SettingContainerWithTextContent}" />
                         <!--  JSON  -->
                         <ItemsControl IsTabStop="False"
                                       ItemTemplate="{StaticResource JsonTemplate}"

src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml

@@ -27,152 +27,126 @@
     </Page.Resources>
 
     <StackPanel Style="{StaticResource SettingsStackStyle}">
-        <!--  Section: Visual style  -->
-        <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Globals_Section_VisualStyle"
-                       Margin="0,0,0,4"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
-            <!--  Theme  -->
-            <local:SettingContainer x:Name="Theme"
-                                    x:Uid="Globals_Theme">
-                <ComboBox AutomationProperties.AccessibilityView="Content"
-                          ItemsSource="{x:Bind ViewModel.ThemeList, Mode=OneWay}"
-                          SelectedItem="{x:Bind ViewModel.CurrentTheme, Mode=TwoWay}"
-                          Style="{StaticResource ComboBoxSettingStyle}">
-                    <ComboBox.ItemTemplate>
-                        <DataTemplate x:DataType="model:Theme">
-                            <TextBlock Text="{x:Bind local:GlobalAppearanceViewModel.ThemeNameConverter((model:Theme)), Mode=OneWay}" />
-                        </DataTemplate>
-                    </ComboBox.ItemTemplate>
-                </ComboBox>
-            </local:SettingContainer>
+        <!--  Theme  -->
+        <local:SettingContainer x:Name="Theme"
+                                x:Uid="Globals_Theme">
+            <ComboBox AutomationProperties.AccessibilityView="Content"
+                      ItemsSource="{x:Bind ViewModel.ThemeList, Mode=OneWay}"
+                      SelectedItem="{x:Bind ViewModel.CurrentTheme, Mode=TwoWay}"
+                      Style="{StaticResource ComboBoxSettingStyle}">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate x:DataType="model:Theme">
+                        <TextBlock Text="{x:Bind local:GlobalAppearanceViewModel.ThemeNameConverter((model:Theme)), Mode=OneWay}" />
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+        </local:SettingContainer>
 
-            <!--  Show Acrylic in Tab Row  -->
-            <local:SettingContainer x:Name="AcrylicTabRow"
-                                    x:Uid="Globals_AcrylicTabRow">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.UseAcrylicInTabRow, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Position of new tab  -->
+        <local:SettingContainer x:Name="NewTabPosition"
+                                x:Uid="Globals_NewTabPosition">
+            <ComboBox AutomationProperties.AccessibilityView="Content"
+                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                      ItemsSource="{x:Bind ViewModel.NewTabPositionList, Mode=OneWay}"
+                      SelectedItem="{x:Bind ViewModel.CurrentNewTabPosition, Mode=TwoWay}"
+                      Style="{StaticResource ComboBoxSettingStyle}" />
+        </local:SettingContainer>
 
-            <!--  Enable Unfocused Acrylic  -->
-            <local:SettingContainer x:Name="EnableUnfocusedAcrylic"
-                                    x:Uid="Globals_EnableUnfocusedAcrylic">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.EnableUnfocusedAcrylic, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Show Titlebar  -->
+        <local:SettingContainer x:Name="ShowTitlebar"
+                                x:Uid="Globals_ShowTitlebar">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTabsInTitlebar, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}"
+                          Toggled="{x:Bind ViewModel.ShowTitlebarToggled}" />
+        </local:SettingContainer>
 
-            <!--  Disable Animations  -->
-            <!--  NOTE: the UID is "DisablePaneAnimationsReversed" not "DisablePaneAnimations". See GH#9124 for more details.  -->
-            <local:SettingContainer x:Name="DisableAnimations"
-                                    x:Uid="Globals_DisableAnimationsReversed">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.InvertedDisableAnimations, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
-        </StackPanel>
+        <!--  Always show tabs  -->
+        <local:SettingContainer x:Name="AlwaysShowTabs"
+                                x:Uid="Globals_AlwaysShowTabs">
+            <ToggleSwitch IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.ShowTabsInTitlebar), Mode=OneWay}"
+                          IsOn="{x:Bind ViewModel.AlwaysShowTabs, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-        <!--  Section: Tabs and layout  -->
-        <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Globals_Section_TabsLayout"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
-            <!--  Position of new tab  -->
-            <local:SettingContainer x:Name="NewTabPosition"
-                                    x:Uid="Globals_NewTabPosition">
-                <ComboBox AutomationProperties.AccessibilityView="Content"
-                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                          ItemsSource="{x:Bind ViewModel.NewTabPositionList, Mode=OneWay}"
-                          SelectedItem="{x:Bind ViewModel.CurrentNewTabPosition, Mode=TwoWay}"
-                          Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
+        <!--  Show tabs in full screen  -->
+        <local:SettingContainer x:Name="ShowTabsFullscreen"
+                                x:Uid="Globals_ShowTabsFullscreen">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTabsFullscreen, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Always show tabs  -->
-            <local:SettingContainer x:Name="AlwaysShowTabs"
-                                    x:Uid="Globals_AlwaysShowTabs">
-                <ToggleSwitch IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.ShowTabsInTitlebar), Mode=OneWay}"
-                              IsOn="{x:Bind ViewModel.AlwaysShowTabs, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Show Acrylic in Tab Row  -->
+        <local:SettingContainer x:Name="AcrylicTabRow"
+                                x:Uid="Globals_AcrylicTabRow">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.UseAcrylicInTabRow, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Show tabs in full screen  -->
-            <local:SettingContainer x:Name="ShowTabsFullscreen"
-                                    x:Uid="Globals_ShowTabsFullscreen">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTabsFullscreen, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Show Title in Titlebar  -->
+        <local:SettingContainer x:Name="ShowTitleInTitlebar"
+                                x:Uid="Globals_ShowTitleInTitlebar">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTitleInTitlebar, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Tab Width Mode  -->
-            <local:SettingContainer x:Name="TabWidthMode"
-                                    x:Uid="Globals_TabWidthMode">
-                <ComboBox AutomationProperties.AccessibilityView="Content"
-                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                          ItemsSource="{x:Bind ViewModel.TabWidthModeList, Mode=OneWay}"
-                          SelectedItem="{x:Bind ViewModel.CurrentTabWidthMode, Mode=TwoWay}"
-                          Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
+        <!--  Always on Top  -->
+        <local:SettingContainer x:Name="AlwaysOnTop"
+                                x:Uid="Globals_AlwaysOnTop">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysOnTop, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Show Titlebar  -->
-            <local:SettingContainer x:Name="ShowTitlebar"
-                                    x:Uid="Globals_ShowTitlebar">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTabsInTitlebar, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}"
-                              Toggled="{x:Bind ViewModel.ShowTitlebarToggled}" />
-            </local:SettingContainer>
-        </StackPanel>
+        <!--  Tab Width Mode  -->
+        <local:SettingContainer x:Name="TabWidthMode"
+                                x:Uid="Globals_TabWidthMode">
+            <ComboBox AutomationProperties.AccessibilityView="Content"
+                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                      ItemsSource="{x:Bind ViewModel.TabWidthModeList, Mode=OneWay}"
+                      SelectedItem="{x:Bind ViewModel.CurrentTabWidthMode, Mode=TwoWay}"
+                      Style="{StaticResource ComboBoxSettingStyle}" />
+        </local:SettingContainer>
 
-        <!--  Section: Window behavior  -->
-        <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Globals_Section_WindowBehavior"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
-            <!--  Always on Top  -->
-            <local:SettingContainer x:Name="AlwaysOnTop"
-                                    x:Uid="Globals_AlwaysOnTop">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysOnTop, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Disable Animations  -->
+        <!--  NOTE: the UID is "DisablePaneAnimationsReversed" not "DisablePaneAnimations". See GH#9124 for more details.  -->
+        <local:SettingContainer x:Name="DisableAnimations"
+                                x:Uid="Globals_DisableAnimationsReversed">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.InvertedDisableAnimations, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Automatically hide window  -->
-            <local:SettingContainer x:Name="AutoHideWindow"
-                                    x:Uid="Globals_AutoHideWindow">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.AutoHideWindow, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
-        </StackPanel>
+        <!--  Always Show Notification Icon  -->
+        <local:SettingContainer x:Name="AlwaysShowNotificationIcon"
+                                x:Uid="Globals_AlwaysShowNotificationIcon">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysShowNotificationIcon, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-        <!--  Section: Title bar & identity  -->
-        <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Globals_Section_TitleBarIdentity"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
-            <!--  Show Title in Titlebar (use active terminal title as application title)  -->
-            <local:SettingContainer x:Name="ShowTitleInTitlebar"
-                                    x:Uid="Globals_ShowTitleInTitlebar">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTitleInTitlebar, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Minimize To Notification Area  -->
+        <local:SettingContainer x:Name="MinimizeToNotificationArea"
+                                x:Uid="Globals_MinimizeToNotificationArea">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.MinimizeToNotificationArea, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Show Admin Shield  -->
-            <local:SettingContainer x:Name="ShowAdminShield"
-                                    x:Uid="Globals_ShowAdminShield">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.ShowAdminShield, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
-        </StackPanel>
+        <!--  Automatically hide window  -->
+        <local:SettingContainer x:Name="AutoHideWindow"
+                                x:Uid="Globals_AutoHideWindow">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.AutoHideWindow, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-        <!--  Section: System integration & notifications  -->
-        <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Globals_Section_SystemIntegration"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
-            <!--  Always Show Notification Icon  -->
-            <local:SettingContainer x:Name="AlwaysShowNotificationIcon"
-                                    x:Uid="Globals_AlwaysShowNotificationIcon">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysShowNotificationIcon, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Show Admin Shield  -->
+        <local:SettingContainer x:Name="ShowAdminShield"
+                                x:Uid="Globals_ShowAdminShield">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.ShowAdminShield, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Minimize To Notification Area  -->
-            <local:SettingContainer x:Name="MinimizeToNotificationArea"
-                                    x:Uid="Globals_MinimizeToNotificationArea">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.MinimizeToNotificationArea, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
-        </StackPanel>
+        <!--  Enable Unfocused Acrylic  -->
+        <local:SettingContainer x:Name="EnableUnfocusedAcrylic"
+                                x:Uid="Globals_EnableUnfocusedAcrylic">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.EnableUnfocusedAcrylic, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
     </StackPanel>
 </Page>

src/cascadia/TerminalSettingsEditor/Interaction.xaml

@@ -26,173 +26,146 @@
 
     <StackPanel>
         <StackPanel Style="{StaticResource SettingsStackStyle}">
-            <!--  Section: Clipboard and paste behavior  -->
-            <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock x:Uid="Interaction_Section_Clipboard"
-                           Margin="0,0,0,4"
-                           Style="{StaticResource TextBlockSubHeaderStyle}" />
-                <!--  Copy On Select  -->
-                <local:SettingContainer x:Name="CopyOnSelect"
-                                        x:Uid="Globals_CopyOnSelect">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.CopyOnSelect, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  Copy On Select  -->
+            <local:SettingContainer x:Name="CopyOnSelect"
+                                    x:Uid="Globals_CopyOnSelect">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.CopyOnSelect, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <!--  Trim Paste  -->
-                <local:SettingContainer x:Name="TrimPaste"
-                                        x:Uid="Globals_TrimPaste">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.TrimPaste, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  Copy Format  -->
+            <local:SettingContainer x:Name="CopyFormat"
+                                    x:Uid="Globals_CopyFormat">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind ViewModel.CopyFormatList, Mode=OneWay}"
+                          SelectedItem="{x:Bind ViewModel.CurrentCopyFormat, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
 
-                <!--  Trim Block Selection  -->
-                <local:SettingContainer x:Name="TrimBlockSelection"
-                                        x:Uid="Globals_TrimBlockSelection">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.TrimBlockSelection, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  Trim Block Selection  -->
+            <local:SettingContainer x:Name="TrimBlockSelection"
+                                    x:Uid="Globals_TrimBlockSelection">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.TrimBlockSelection, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <!--  Copy Format  -->
-                <local:SettingContainer x:Name="CopyFormat"
-                                        x:Uid="Globals_CopyFormat">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
-                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind ViewModel.CopyFormatList, Mode=OneWay}"
-                              SelectedItem="{x:Bind ViewModel.CurrentCopyFormat, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
-            </StackPanel>
+            <!--  Trim Paste  -->
+            <local:SettingContainer x:Name="TrimPaste"
+                                    x:Uid="Globals_TrimPaste">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.TrimPaste, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-            <!--  Section: Text selection & editing  -->
-            <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock x:Uid="Interaction_Section_TextSelection"
-                           Style="{StaticResource TextBlockSubHeaderStyle}" />
-                <!--  Word Delimiters  -->
-                <local:SettingContainer x:Name="WordDelimiters"
-                                        x:Uid="Globals_WordDelimiters"
-                                        CurrentValue="{x:Bind ViewModel.WordDelimiters, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}">
-                    <TextBox IsSpellCheckEnabled="False"
-                             Style="{StaticResource TextBoxSettingStyle}"
-                             Text="{x:Bind ViewModel.WordDelimiters, Mode=TwoWay}" />
-                </local:SettingContainer>
+            <!--  Word Delimiters  -->
+            <local:SettingContainer x:Name="WordDelimiters"
+                                    x:Uid="Globals_WordDelimiters"
+                                    CurrentValue="{x:Bind ViewModel.WordDelimiters, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <TextBox IsSpellCheckEnabled="False"
+                         Style="{StaticResource TextBoxSettingStyle}"
+                         Text="{x:Bind ViewModel.WordDelimiters, Mode=TwoWay}" />
+            </local:SettingContainer>
 
-                <!--  Enable Color Selection  -->
-                <local:SettingContainer x:Name="EnableColorSelection"
-                                        x:Uid="Globals_EnableColorSelection">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.EnableColorSelection, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
-            </StackPanel>
+            <!--  Snap On Resize  -->
+            <local:SettingContainer x:Name="SnapToGridOnResize"
+                                    x:Uid="Globals_SnapToGridOnResize">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.SnapToGridOnResize, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-            <!--  Section: Window and layout behavior  -->
-            <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock x:Uid="Interaction_Section_WindowLayout"
-                           Style="{StaticResource TextBlockSubHeaderStyle}" />
-                <!--  Snap On Resize  -->
-                <local:SettingContainer x:Name="SnapToGridOnResize"
-                                        x:Uid="Globals_SnapToGridOnResize">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.SnapToGridOnResize, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  Tab Switcher Mode  -->
+            <local:SettingContainer x:Name="TabSwitcherMode"
+                                    x:Uid="Globals_TabSwitcherMode">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind ViewModel.TabSwitcherModeList}"
+                          SelectedItem="{x:Bind ViewModel.CurrentTabSwitcherMode, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
 
-                <!--  Focus Follow Mouse Mode  -->
-                <local:SettingContainer x:Name="FocusFollowMouse"
-                                        x:Uid="Globals_FocusFollowMouse">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.FocusFollowMouse, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  Focus Follow Mouse Mode  -->
+            <local:SettingContainer x:Name="FocusFollowMouse"
+                                    x:Uid="Globals_FocusFollowMouse">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.FocusFollowMouse, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <!--  Tab Switcher Mode  -->
-                <local:SettingContainer x:Name="TabSwitcherMode"
-                                        x:Uid="Globals_TabSwitcherMode">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
-                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind ViewModel.TabSwitcherModeList}"
-                              SelectedItem="{x:Bind ViewModel.CurrentTabSwitcherMode, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
-            </StackPanel>
+            <!--  Enable Font Size Changes with Scrolling  -->
+            <local:SettingContainer x:Name="ScrollToZoom"
+                                    x:Uid="Globals_ScrollToZoom">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.ScrollToZoom, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-            <!--  Section: Mouse & scrolling  -->
-            <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock x:Uid="Interaction_Section_MouseScrolling"
-                           Style="{StaticResource TextBlockSubHeaderStyle}" />
-                <!--  Enable Font Size Changes with Scrolling  -->
-                <local:SettingContainer x:Name="ScrollToZoom"
-                                        x:Uid="Globals_ScrollToZoom">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.ScrollToZoom, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  Enable Window Opacity Changes with Scrolling  -->
+            <local:SettingContainer x:Name="ScrollToChangeOpacity"
+                                    x:Uid="Globals_ScrollToChangeOpacity">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.ScrollToChangeOpacity, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <!--  Enable Window Opacity Changes with Scrolling  -->
-                <local:SettingContainer x:Name="ScrollToChangeOpacity"
-                                        x:Uid="Globals_ScrollToChangeOpacity">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.ScrollToChangeOpacity, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
-            </StackPanel>
+            <!--  Detect URLs  -->
+            <local:SettingContainer x:Name="DetectURLs"
+                                    x:Uid="Globals_DetectURLs">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.DetectURLs, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-            <!--  Section: URLs & external actions  -->
-            <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock x:Uid="Interaction_Section_UrlsExternal"
-                           Style="{StaticResource TextBlockSubHeaderStyle}" />
-                <!--  Detect URLs  -->
-                <local:SettingContainer x:Name="DetectURLs"
-                                        x:Uid="Globals_DetectURLs">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.DetectURLs, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  Search Web Default Query URL  -->
+            <local:SettingContainer x:Name="SearchWebDefaultQueryUrl"
+                                    x:Uid="Globals_SearchWebDefaultQueryUrl"
+                                    CurrentValue="{x:Bind ViewModel.SearchWebDefaultQueryUrl, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <TextBox IsSpellCheckEnabled="False"
+                         Style="{StaticResource TextBoxSettingStyle}"
+                         Text="{x:Bind ViewModel.SearchWebDefaultQueryUrl, Mode=TwoWay}" />
+            </local:SettingContainer>
 
-                <!--  Search Web Default Query URL  -->
-                <local:SettingContainer x:Name="SearchWebDefaultQueryUrl"
-                                        x:Uid="Globals_SearchWebDefaultQueryUrl"
-                                        CurrentValue="{x:Bind ViewModel.SearchWebDefaultQueryUrl, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}">
-                    <TextBox IsSpellCheckEnabled="False"
-                             Style="{StaticResource TextBoxSettingStyle}"
-                             Text="{x:Bind ViewModel.SearchWebDefaultQueryUrl, Mode=TwoWay}" />
-                </local:SettingContainer>
-            </StackPanel>
+            <!--  Enable Color Selection  -->
+            <local:SettingContainer x:Name="EnableColorSelection"
+                                    x:Uid="Globals_EnableColorSelection">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.EnableColorSelection, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
+        </StackPanel>
 
-            <!--  Section: Warnings  -->
-            <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock x:Uid="Interaction_Section_Warnings"
-                           Style="{StaticResource TextBlockSubHeaderStyle}" />
-                <!--  Confirm Close On  -->
-                <local:SettingContainer x:Name="ConfirmOnClose"
-                                        x:Uid="Globals_ConfirmOnClose">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
-                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind ViewModel.ConfirmOnCloseList}"
-                              SelectedItem="{x:Bind ViewModel.CurrentConfirmOnClose, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
+        <StackPanel Style="{StaticResource SettingsStackStyle}">
+            <!--  Grouping: Warnings  -->
+            <TextBlock x:Uid="Globals_WarningsHeader"
+                       Style="{StaticResource TextBlockSubHeaderStyle}" />
 
-                <!--  Input Service Warning  -->
-                <local:SettingContainer x:Name="InputServiceWarning"
-                                        x:Uid="Globals_InputServiceWarning">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.InputServiceWarning, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  Close All Tabs Warning  -->
+            <local:SettingContainer x:Name="ConfirmCloseAllTabs"
+                                    x:Uid="Globals_ConfirmCloseAllTabs">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.ConfirmCloseAllTabs, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <!--  Large Paste Warning  -->
-                <local:SettingContainer x:Name="WarnAboutLargePaste"
-                                        x:Uid="Globals_WarnAboutLargePaste">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.WarnAboutLargePaste, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  Input Service Warning  -->
+            <local:SettingContainer x:Name="InputServiceWarning"
+                                    x:Uid="Globals_InputServiceWarning">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.InputServiceWarning, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
+
+            <!--  Large Paste Warning  -->
+            <local:SettingContainer x:Name="WarnAboutLargePaste"
+                                    x:Uid="Globals_WarnAboutLargePaste">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.WarnAboutLargePaste, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
+
+            <!--  Multi Line Paste Warning  -->
+            <local:SettingContainer x:Name="WarnAboutMultiLinePaste"
+                                    x:Uid="Globals_WarnAboutMultiLinePaste">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind WarnAboutMultiLinePasteList}"
+                          SelectedItem="{x:Bind CurrentWarnAboutMultiLinePaste, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
 
-                <!--  Multi Line Paste Warning  -->
-                <local:SettingContainer x:Name="WarnAboutMultiLinePaste"
-                                        x:Uid="Globals_WarnAboutMultiLinePaste">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
-                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind WarnAboutMultiLinePasteList}"
-                              SelectedItem="{x:Bind CurrentWarnAboutMultiLinePaste, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
-            </StackPanel>
         </StackPanel>
     </StackPanel>
 </Page>

src/cascadia/TerminalSettingsEditor/InteractionViewModel.cpp

@@ -17,6 +17,5 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     {
         INITIALIZE_BINDABLE_ENUM_SETTING(TabSwitcherMode, TabSwitcherMode, TabSwitcherMode, L"Globals_TabSwitcherMode", L"Content");
         INITIALIZE_BINDABLE_ENUM_SETTING(CopyFormat, CopyFormat, winrt::Microsoft::Terminal::Control::CopyFormat, L"Globals_CopyFormat", L"Content");
-        INITIALIZE_BINDABLE_ENUM_SETTING(ConfirmOnClose, ConfirmOnClose, Model::ConfirmOnClose, L"Globals_ConfirmOnClose", L"Content");
     }
 }

src/cascadia/TerminalSettingsEditor/InteractionViewModel.h

@@ -19,7 +19,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         GETSET_BINDABLE_ENUM_SETTING(TabSwitcherMode, Model::TabSwitcherMode, _GlobalSettings.TabSwitcherMode);
         GETSET_BINDABLE_ENUM_SETTING(CopyFormat, winrt::Microsoft::Terminal::Control::CopyFormat, _GlobalSettings.CopyFormatting);
-        GETSET_BINDABLE_ENUM_SETTING(ConfirmOnClose, Model::ConfirmOnClose, _GlobalSettings.ConfirmOnClose);
 
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, CopyOnSelect);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, TrimBlockSelection);
@@ -31,6 +30,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, DetectURLs);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, SearchWebDefaultQueryUrl);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, WordDelimiters);
+        PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, ConfirmCloseAllTabs);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, InputServiceWarning);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, WarnAboutLargePaste);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, WarnAboutMultiLinePaste);

src/cascadia/TerminalSettingsEditor/InteractionViewModel.idl

@@ -12,13 +12,10 @@ namespace Microsoft.Terminal.Settings.Editor
         InteractionViewModel(Microsoft.Terminal.Settings.Model.GlobalAppSettings globalSettings);
 
         IInspectable CurrentTabSwitcherMode;
-        Windows.Foundation.Collections.IObservableVector<EnumEntry> TabSwitcherModeList { get; };
+        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> TabSwitcherModeList { get; };
 
         IInspectable CurrentCopyFormat;
-        Windows.Foundation.Collections.IObservableVector<EnumEntry> CopyFormatList { get; };
-
-        IInspectable CurrentConfirmOnClose;
-        Windows.Foundation.Collections.IObservableVector<EnumEntry> ConfirmOnCloseList { get; };
+        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> CopyFormatList { get; };
 
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, CopyOnSelect);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, TrimBlockSelection);
@@ -30,6 +27,7 @@ namespace Microsoft.Terminal.Settings.Editor
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, DetectURLs);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(String, SearchWebDefaultQueryUrl);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(String, WordDelimiters);
+        PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, ConfirmCloseAllTabs);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, InputServiceWarning);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, WarnAboutLargePaste);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(Microsoft.Terminal.Control.WarnAboutMultiLinePaste, WarnAboutMultiLinePaste);

src/cascadia/TerminalSettingsEditor/KeyChordVisual.cpp

@@ -1,131 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "KeyChordVisual.h"
-#include "KeyChordVisual.g.cpp"
-
-using namespace winrt::Windows::UI::Xaml;
-using namespace winrt::Windows::UI::Xaml::Controls;
-using namespace winrt::Windows::Foundation;
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    DependencyProperty KeyChordVisual::_KeyChordProperty{ nullptr };
-
-    KeyChordVisual::KeyChordVisual()
-    {
-        InitializeComponent();
-        _InitializeProperties();
-    }
-
-    void KeyChordVisual::_InitializeProperties()
-    {
-        if (!_KeyChordProperty)
-        {
-            _KeyChordProperty =
-                DependencyProperty::Register(
-                    L"KeyChord",
-                    xaml_typename<Control::KeyChord>(),
-                    xaml_typename<Editor::KeyChordVisual>(),
-                    PropertyMetadata{ nullptr, PropertyChangedCallback{ &KeyChordVisual::_OnKeyChordChanged } });
-        }
-    }
-
-    void KeyChordVisual::_OnKeyChordChanged(const DependencyObject& d, const DependencyPropertyChangedEventArgs& /*e*/)
-    {
-        if (const auto control{ d.try_as<Editor::KeyChordVisual>() })
-        {
-            const auto controlImpl{ get_self<KeyChordVisual>(control) };
-            controlImpl->_UpdateKeyVisuals();
-        }
-    }
-
-    // Capitalizes the first character of the provided string.
-    // Examples: "enter" -> "Enter", "f1" -> "F1", "v" -> "V"
-    static winrt::hstring _formatMainKeyName(std::wstring_view part)
-    {
-        if (part.empty())
-        {
-            return {};
-        }
-
-        std::wstring buffer{ part };
-        buffer[0] = til::toupper_ascii(buffer[0]);
-        return winrt::hstring{ buffer };
-    }
-
-    void KeyChordVisual::_UpdateKeyVisuals()
-    {
-        auto panel{ KeysPanel() };
-        if (!panel)
-        {
-            return;
-        }
-        panel.Children().Clear();
-
-        const auto kc{ KeyChord() };
-        if (!kc)
-        {
-            return;
-        }
-
-        // Reuse the canonical serialization so the key naming stays in sync with the
-        // rest of the app. Then split on '+' (no key name in the table contains a literal
-        // '+'; VK_OEM_PLUS serializes as "plus") and render each part as its own visual.
-        const auto serialized{ Model::KeyChordSerialization::ToString(kc) };
-        if (serialized.empty())
-        {
-            return;
-        }
-
-        const std::wstring_view full{ serialized };
-        for (const auto part : til::split_iterator{ full, L'+' })
-        {
-            if (til::equals_insensitive_ascii(part, L"win"))
-            {
-                _AddGlyphKey();
-            }
-            else if (til::equals_insensitive_ascii(part, L"ctrl"))
-            {
-                _AddTextKey(L"Ctrl");
-            }
-            else if (til::equals_insensitive_ascii(part, L"alt"))
-            {
-                _AddTextKey(L"Alt");
-            }
-            else if (til::equals_insensitive_ascii(part, L"shift"))
-            {
-                _AddTextKey(L"Shift");
-            }
-            else
-            {
-                _AddTextKey(_formatMainKeyName(part));
-            }
-        }
-    }
-
-    void KeyChordVisual::_AddTextKey(const winrt::hstring& text)
-    {
-        const auto tmpl{ Resources().Lookup(box_value(L"KeyChordVisualTextKeyTemplate")).as<DataTemplate>() };
-        const auto border{ tmpl.LoadContent().as<Border>() };
-        if (const auto tb{ border.Child().try_as<TextBlock>() })
-        {
-            tb.Text(text);
-        }
-        KeysPanel().Children().Append(border);
-    }
-
-    void KeyChordVisual::_AddGlyphKey()
-    {
-        const auto tmpl{ Resources().Lookup(box_value(L"KeyChordVisualWindowsKeyTemplate")).as<DataTemplate>() };
-        const auto border{ tmpl.LoadContent().as<Border>() };
-
-        // Provide an accessible name for the glyph since it has no text fallback.
-        if (const auto path{ border.Child() })
-        {
-            Automation::AutomationProperties::SetName(path, L"Win");
-        }
-        KeysPanel().Children().Append(border);
-    }
-}

src/cascadia/TerminalSettingsEditor/KeyChordVisual.h

@@ -1,31 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#pragma once
-
-#include "KeyChordVisual.g.h"
-#include "Utils.h"
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    struct KeyChordVisual : KeyChordVisualT<KeyChordVisual>
-    {
-    public:
-        KeyChordVisual();
-
-        DEPENDENCY_PROPERTY(Control::KeyChord, KeyChord);
-
-    private:
-        static void _InitializeProperties();
-        static void _OnKeyChordChanged(const Windows::UI::Xaml::DependencyObject& d, const Windows::UI::Xaml::DependencyPropertyChangedEventArgs& e);
-
-        void _UpdateKeyVisuals();
-        void _AddTextKey(const winrt::hstring& text);
-        void _AddGlyphKey();
-    };
-}
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
-{
-    BASIC_FACTORY(KeyChordVisual);
-}

src/cascadia/TerminalSettingsEditor/KeyChordVisual.idl

@@ -1,13 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-namespace Microsoft.Terminal.Settings.Editor
-{
-    [default_interface] runtimeclass KeyChordVisual : Windows.UI.Xaml.Controls.UserControl
-    {
-        KeyChordVisual();
-
-        Microsoft.Terminal.Control.KeyChord KeyChord;
-        static Windows.UI.Xaml.DependencyProperty KeyChordProperty { get; };
-    }
-}

src/cascadia/TerminalSettingsEditor/KeyChordVisual.xaml

@@ -1,82 +0,0 @@
-<!--
-    Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
-    the MIT License. See LICENSE in the project root for license information.
--->
-<UserControl x:Class="Microsoft.Terminal.Settings.Editor.KeyChordVisual"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             HorizontalAlignment="Right"
-             VerticalAlignment="Center"
-             IsTabStop="False"
-             mc:Ignorable="d">
-
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Default">
-                    <StaticResource x:Key="KeyChordVisualKeyBackground"
-                                    ResourceKey="AccentFillColorDefaultBrush" />
-                    <StaticResource x:Key="KeyChordVisualKeyForeground"
-                                    ResourceKey="TextOnAccentFillColorPrimaryBrush" />
-                    <StaticResource x:Key="KeyChordVisualKeyBorderBrush"
-                                    ResourceKey="AccentControlElevationBorderBrush" />
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="HighContrast">
-                    <StaticResource x:Key="KeyChordVisualKeyBackground"
-                                    ResourceKey="SystemColorButtonFaceColorBrush" />
-                    <StaticResource x:Key="KeyChordVisualKeyForeground"
-                                    ResourceKey="SystemColorButtonTextColorBrush" />
-                    <StaticResource x:Key="KeyChordVisualKeyBorderBrush"
-                                    ResourceKey="SystemColorButtonTextColorBrush" />
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
-
-            <Style x:Key="KeyChordVisualKeyBorderStyle"
-                   TargetType="Border">
-                <Setter Property="MinWidth" Value="32" />
-                <Setter Property="MinHeight" Value="28" />
-                <Setter Property="Padding" Value="8,2,8,2" />
-                <Setter Property="HorizontalAlignment" Value="Center" />
-                <Setter Property="VerticalAlignment" Value="Center" />
-                <Setter Property="Background" Value="{ThemeResource KeyChordVisualKeyBackground}" />
-                <Setter Property="BorderBrush" Value="{ThemeResource KeyChordVisualKeyBorderBrush}" />
-                <Setter Property="BorderThickness" Value="1" />
-                <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-            </Style>
-            <Style x:Key="KeyChordVisualKeyTextStyle"
-                   TargetType="TextBlock">
-                <Setter Property="FontSize" Value="13" />
-                <Setter Property="HorizontalAlignment" Value="Center" />
-                <Setter Property="VerticalAlignment" Value="Center" />
-                <Setter Property="TextAlignment" Value="Center" />
-                <Setter Property="Foreground" Value="{ThemeResource KeyChordVisualKeyForeground}" />
-            </Style>
-
-            <DataTemplate x:Key="KeyChordVisualTextKeyTemplate">
-                <Border Style="{StaticResource KeyChordVisualKeyBorderStyle}">
-                    <TextBlock Style="{StaticResource KeyChordVisualKeyTextStyle}" />
-                </Border>
-            </DataTemplate>
-
-            <DataTemplate x:Key="KeyChordVisualWindowsKeyTemplate">
-                <Border Style="{StaticResource KeyChordVisualKeyBorderStyle}">
-                    <Path Width="11"
-                          Height="11"
-                          HorizontalAlignment="Center"
-                          VerticalAlignment="Center"
-                          Data="M9 20H0V11H9V20ZM20 20H11V11H20V20ZM9 9H0V0H9V9ZM20 9H11V0H20V9Z"
-                          Fill="{ThemeResource KeyChordVisualKeyForeground}"
-                          Stretch="Uniform" />
-                </Border>
-            </DataTemplate>
-        </ResourceDictionary>
-    </UserControl.Resources>
-
-    <StackPanel x:Name="KeysPanel"
-                HorizontalAlignment="Right"
-                VerticalAlignment="Center"
-                Orientation="Horizontal"
-                Spacing="2" />
-</UserControl>

src/cascadia/TerminalSettingsEditor/Launch.xaml

@@ -43,290 +43,279 @@
 
     <StackPanel>
         <StackPanel Style="{StaticResource SettingsStackStyle}">
-            <!--  Section: Launch behavior  -->
-            <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock x:Uid="Launch_Section_LaunchBehavior"
-                           Margin="0,0,0,4"
-                           Style="{StaticResource TextBlockSubHeaderStyle}" />
-                <!--  Default Profile  -->
-                <local:SettingContainer x:Name="DefaultProfile"
-                                        x:Uid="Globals_DefaultProfile">
-                    <ComboBox ItemsSource="{x:Bind ViewModel.DefaultProfiles}"
-                              SelectedItem="{x:Bind ViewModel.CurrentDefaultProfile, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}">
-                        <ComboBox.ItemTemplate>
-                            <DataTemplate x:DataType="SettingsModel:Profile">
-                                <Grid HorizontalAlignment="Stretch"
-                                      ColumnSpacing="8">
+            <!--  Default Profile  -->
+            <local:SettingContainer x:Name="DefaultProfile"
+                                    x:Uid="Globals_DefaultProfile">
+                <ComboBox ItemsSource="{x:Bind ViewModel.DefaultProfiles}"
+                          SelectedItem="{x:Bind ViewModel.CurrentDefaultProfile, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate x:DataType="SettingsModel:Profile">
+                            <Grid HorizontalAlignment="Stretch"
+                                  ColumnSpacing="8">
 
-                                    <Grid.ColumnDefinitions>
-                                        <!--  icon  -->
-                                        <ColumnDefinition Width="16" />
-                                        <!--  profile name  -->
-                                        <ColumnDefinition Width="Auto" />
-                                    </Grid.ColumnDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <!--  icon  -->
+                                    <ColumnDefinition Width="16" />
+                                    <!--  profile name  -->
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
 
-                                    <IconSourceElement Grid.Column="0"
-                                                       Width="16"
-                                                       Height="16"
-                                                       IconSource="{x:Bind mtu:IconPathConverter.IconSourceWUX(Icon.Resolved), Mode=OneTime}" />
+                                <IconSourceElement Grid.Column="0"
+                                                   Width="16"
+                                                   Height="16"
+                                                   IconSource="{x:Bind mtu:IconPathConverter.IconSourceWUX(Icon.Resolved), Mode=OneTime}" />
 
-                                    <TextBlock Grid.Column="1"
-                                               Text="{x:Bind Name}" />
+                                <TextBlock Grid.Column="1"
+                                           Text="{x:Bind Name}" />
 
-                                </Grid>
-                            </DataTemplate>
-                        </ComboBox.ItemTemplate>
-                    </ComboBox>
-                </local:SettingContainer>
+                            </Grid>
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+            </local:SettingContainer>
 
-                <!--  First Window Behavior  -->
-                <local:SettingContainer x:Name="FirstWindowPreference"
-                                        x:Uid="Globals_FirstWindowPreference">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
+            <!--  Default Terminal  -->
+            <local:SettingContainer x:Name="DefaultTerminalDropdown"
+                                    x:Uid="Globals_DefaultTerminal"
+                                    x:Load="false">
+                <ComboBox x:Name="DefaultTerminal"
+                          ItemsSource="{x:Bind ViewModel.DefaultTerminals}"
+                          SelectedItem="{x:Bind ViewModel.CurrentDefaultTerminal, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate x:DataType="SettingsModel:DefaultTerminal">
+                            <Grid HorizontalAlignment="Stretch"
+                                  VerticalAlignment="Stretch"
+                                  ColumnSpacing="8">
+
+                                <Grid.ColumnDefinitions>
+                                    <!--  icon  -->
+                                    <ColumnDefinition Width="auto" />
+                                    <!--  terminal name and author  -->
+                                    <ColumnDefinition Width="auto" />
+                                    <!--  version  -->
+                                    <ColumnDefinition Width="auto" />
+                                </Grid.ColumnDefinitions>
+
+                                <Grid.RowDefinitions>
+                                    <!--  terminal name  -->
+                                    <RowDefinition Height="auto" />
+                                    <!--  author and version  -->
+                                    <RowDefinition Height="auto" />
+                                </Grid.RowDefinitions>
+
+                                <IconSourceElement Grid.Row="0"
+                                                   Grid.RowSpan="2"
+                                                   Grid.Column="0"
+                                                   Width="24"
+                                                   Height="24"
+                                                   VerticalAlignment="Center"
+                                                   IconSource="{x:Bind mtu:IconPathConverter.IconSourceWUX(Icon), Mode=OneTime}" />
+
+                                <TextBlock Grid.Row="0"
+                                           Grid.Column="1"
+                                           Grid.ColumnSpan="2"
+                                           VerticalAlignment="Center"
+                                           AutomationProperties.AccessibilityView="Raw"
+                                           Text="{x:Bind Name}" />
+
+                                <TextBlock Grid.Row="1"
+                                           Grid.Column="1"
+                                           AutomationProperties.AccessibilityView="Raw"
+                                           Style="{ThemeResource SecondaryTextBlockStyle}"
+                                           Text="{x:Bind Author}"
+                                           Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Author)}" />
+
+                                <TextBlock Grid.Row="1"
+                                           Grid.Column="2"
+                                           AutomationProperties.AccessibilityView="Raw"
+                                           Style="{ThemeResource SecondaryTextBlockStyle}"
+                                           Text="{x:Bind Version}"
+                                           Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Version)}" />
+
+                            </Grid>
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+            </local:SettingContainer>
+
+            <!--  Language  -->
+            <local:SettingContainer x:Name="Language"
+                                    x:Uid="Globals_Language">
+                <ComboBox ItemsSource="{x:Bind ViewModel.LanguageList}"
+                          SelectedItem="{x:Bind ViewModel.CurrentLanguage, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate x:DataType="x:String">
+                            <TextBlock Text="{x:Bind local:LaunchViewModel.LanguageDisplayConverter((x:String))}" />
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+            </local:SettingContainer>
+
+            <!--  Language  -->
+            <local:SettingContainer x:Name="DefaultInputScope"
+                                    x:Uid="Globals_DefaultInputScope">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind ViewModel.DefaultInputScopeList}"
+                          SelectedItem="{x:Bind ViewModel.CurrentDefaultInputScope, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
+
+            <!--  Start on User Login  -->
+            <local:SettingContainer x:Name="StartOnUserLogin"
+                                    x:Uid="Globals_StartOnUserLogin"
+                                    HelpText="{x:Bind ViewModel.StartOnUserLoginStatefulHelpText, Mode=OneWay}"
+                                    Visibility="{x:Bind ViewModel.StartOnUserLoginAvailable, Mode=OneTime}">
+                <ToggleSwitch IsEnabled="{x:Bind ViewModel.StartOnUserLoginConfigurable, Mode=OneWay}"
+                              IsOn="{x:Bind ViewModel.StartOnUserLogin, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
+
+            <!--  First Window Behavior  -->
+            <local:SettingContainer x:Name="FirstWindowPreference"
+                                    x:Uid="Globals_FirstWindowPreference">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind ViewModel.FirstWindowPreferenceList}"
+                          SelectedItem="{x:Bind ViewModel.CurrentFirstWindowPreference, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
+
+            <!--  Windowing Behavior  -->
+            <local:SettingContainer x:Name="WindowingBehavior"
+                                    x:Uid="Globals_WindowingBehavior">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind ViewModel.WindowingBehaviorList}"
+                          SelectedItem="{x:Bind ViewModel.CurrentWindowingBehavior, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
+
+            <!--  Launch Size  -->
+            <local:SettingContainer x:Name="LaunchSize"
+                                    x:Uid="Globals_LaunchSize"
+                                    CurrentValue="{x:Bind ViewModel.LaunchSizeCurrentValue, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <Grid ColumnSpacing="12"
+                      RowSpacing="8">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock x:Uid="Globals_InitialCols"
+                               Grid.Row="0"
+                               Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Style="{StaticResource SettingsPageItemHeaderStyle}" />
+                    <muxc:NumberBox x:Uid="Globals_InitialColsBox"
+                                    Grid.Row="0"
+                                    Grid.Column="1"
+                                    VerticalAlignment="Center"
+                                    Maximum="999"
+                                    Minimum="1"
+                                    Style="{StaticResource LaunchSizeNumberBoxStyle}"
+                                    Value="{x:Bind ViewModel.InitialCols, Mode=TwoWay}" />
+                    <TextBlock x:Uid="Globals_InitialRows"
+                               Grid.Row="1"
+                               Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Style="{StaticResource SettingsPageItemHeaderStyle}" />
+                    <muxc:NumberBox x:Uid="Globals_InitialRowsBox"
+                                    Grid.Row="1"
+                                    Grid.Column="1"
+                                    VerticalAlignment="Center"
+                                    Maximum="999"
+                                    Minimum="1"
+                                    Style="{StaticResource LaunchSizeNumberBoxStyle}"
+                                    Value="{x:Bind ViewModel.InitialRows, Mode=TwoWay}" />
+                </Grid>
+            </local:SettingContainer>
+
+            <!--  Launch Parameters  -->
+            <local:SettingContainer x:Name="LaunchParameters"
+                                    x:Uid="Globals_LaunchParameters"
+                                    CurrentValue="{x:Bind ViewModel.LaunchParametersCurrentValue, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <Grid RowSpacing="8">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock x:Uid="Globals_LaunchModeSetting"
+                               Grid.Row="0"
+                               Grid.Column="0"
+                               VerticalAlignment="Center" />
+                    <ComboBox x:Name="LaunchModeComboBox"
+                              Grid.Row="0"
+                              Grid.Column="1"
+                              MinWidth="240"
+                              AutomationProperties.AccessibilityView="Content"
                               ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind ViewModel.FirstWindowPreferenceList}"
-                              SelectedItem="{x:Bind ViewModel.CurrentFirstWindowPreference, Mode=TwoWay}"
+                              ItemsSource="{x:Bind ViewModel.LaunchModeList}"
+                              SelectedItem="{x:Bind ViewModel.CurrentLaunchMode, Mode=TwoWay}"
                               Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
-
-                <!--  Windowing Behavior  -->
-                <local:SettingContainer x:Name="WindowingBehavior"
-                                        x:Uid="Globals_WindowingBehavior">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
-                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind ViewModel.WindowingBehaviorList}"
-                              SelectedItem="{x:Bind ViewModel.CurrentWindowingBehavior, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
-
-                <!--  Start on User Login  -->
-                <local:SettingContainer x:Name="StartOnUserLogin"
-                                        x:Uid="Globals_StartOnUserLogin"
-                                        HelpText="{x:Bind ViewModel.StartOnUserLoginStatefulHelpText, Mode=OneWay}"
-                                        Visibility="{x:Bind ViewModel.StartOnUserLoginAvailable, Mode=OneTime}">
-                    <ToggleSwitch IsEnabled="{x:Bind ViewModel.StartOnUserLoginConfigurable, Mode=OneWay}"
-                                  IsOn="{x:Bind ViewModel.StartOnUserLogin, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
-
-                <!--  Launch Parameters  -->
-                <local:SettingContainer x:Name="LaunchParameters"
-                                        x:Uid="Globals_LaunchParameters"
-                                        CurrentValue="{x:Bind ViewModel.LaunchParametersCurrentValue, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}">
-                    <Grid RowSpacing="8">
+                    <TextBlock x:Uid="Globals_LaunchPosition"
+                               Grid.Row="1"
+                               Grid.Column="0"
+                               VerticalAlignment="Center" />
+                    <Grid Grid.Row="1"
+                          Grid.Column="1"
+                          ColumnSpacing="4">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
-                        <TextBlock x:Uid="Globals_LaunchModeSetting"
-                                   Grid.Row="0"
-                                   Grid.Column="0"
-                                   VerticalAlignment="Center" />
-                        <ComboBox x:Name="LaunchModeComboBox"
-                                  Grid.Row="0"
-                                  Grid.Column="1"
-                                  MinWidth="240"
-                                  AutomationProperties.AccessibilityView="Content"
-                                  ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                                  ItemsSource="{x:Bind ViewModel.LaunchModeList}"
-                                  SelectedItem="{x:Bind ViewModel.CurrentLaunchMode, Mode=TwoWay}"
-                                  Style="{StaticResource ComboBoxSettingStyle}" />
-                        <TextBlock x:Uid="Globals_LaunchPosition"
-                                   Grid.Row="1"
-                                   Grid.Column="0"
-                                   VerticalAlignment="Center" />
-                        <Grid Grid.Row="1"
-                              Grid.Column="1"
-                              ColumnSpacing="4">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <!--  Match the width of these NumberBoxes to the Width of the LaunchModeComboBox above minus the Grid's ColumnSpacing  -->
-                            <muxc:NumberBox x:Name="PosXBox"
-                                            x:Uid="Globals_InitialPosXBox"
-                                            Grid.Row="0"
-                                            Grid.Column="0"
-                                            Width="118"
-                                            IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.UseDefaultLaunchPosition), Mode=OneWay}"
-                                            Style="{StaticResource LaunchPositionNumberBoxStyle}"
-                                            Value="{x:Bind ViewModel.InitialPosX, Mode=TwoWay}" />
-                            <muxc:NumberBox x:Name="PosYBox"
-                                            x:Uid="Globals_InitialPosYBox"
-                                            Grid.Row="0"
-                                            Grid.Column="1"
-                                            Width="118"
-                                            IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.UseDefaultLaunchPosition), Mode=OneWay}"
-                                            Style="{StaticResource LaunchPositionNumberBoxStyle}"
-                                            Value="{x:Bind ViewModel.InitialPosY, Mode=TwoWay}" />
-                            <CheckBox x:Name="UseDefaultLaunchPositionCheckbox"
-                                      x:Uid="Globals_DefaultLaunchPositionCheckbox"
-                                      Grid.Row="1"
-                                      Grid.Column="0"
-                                      Grid.ColumnSpan="2"
-                                      IsChecked="{x:Bind ViewModel.UseDefaultLaunchPosition, Mode=TwoWay}" />
-                        </Grid>
-                        <TextBlock x:Uid="Globals_CenterOnLaunch"
-                                   Grid.Row="2"
-                                   Grid.Column="0"
-                                   VerticalAlignment="Center" />
-                        <ToggleSwitch x:Name="CenterOnLaunchToggle"
-                                      Grid.Row="2"
-                                      Grid.Column="1"
-                                      IsOn="{x:Bind ViewModel.CenterOnLaunch, Mode=TwoWay}"
-                                      Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                    </Grid>
-                </local:SettingContainer>
-
-                <!--  Launch Size  -->
-                <local:SettingContainer x:Name="LaunchSize"
-                                        x:Uid="Globals_LaunchSize"
-                                        CurrentValue="{x:Bind ViewModel.LaunchSizeCurrentValue, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}">
-                    <Grid ColumnSpacing="12"
-                          RowSpacing="8">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <TextBlock x:Uid="Globals_InitialCols"
-                                   Grid.Row="0"
-                                   Grid.Column="0"
-                                   VerticalAlignment="Center"
-                                   Style="{StaticResource SettingsPageItemHeaderStyle}" />
-                        <muxc:NumberBox x:Uid="Globals_InitialColsBox"
+                        <!--  Match the width of these NumberBoxes to the Width of the LaunchModeComboBox above minus the Grid's ColumnSpacing  -->
+                        <muxc:NumberBox x:Name="PosXBox"
+                                        x:Uid="Globals_InitialPosXBox"
+                                        Grid.Row="0"
+                                        Grid.Column="0"
+                                        Width="118"
+                                        IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.UseDefaultLaunchPosition), Mode=OneWay}"
+                                        Style="{StaticResource LaunchPositionNumberBoxStyle}"
+                                        Value="{x:Bind ViewModel.InitialPosX, Mode=TwoWay}" />
+                        <muxc:NumberBox x:Name="PosYBox"
+                                        x:Uid="Globals_InitialPosYBox"
                                         Grid.Row="0"
                                         Grid.Column="1"
-                                        VerticalAlignment="Center"
-                                        Maximum="999"
-                                        Minimum="1"
-                                        Style="{StaticResource LaunchSizeNumberBoxStyle}"
-                                        Value="{x:Bind ViewModel.InitialCols, Mode=TwoWay}" />
-                        <TextBlock x:Uid="Globals_InitialRows"
-                                   Grid.Row="1"
-                                   Grid.Column="0"
-                                   VerticalAlignment="Center"
-                                   Style="{StaticResource SettingsPageItemHeaderStyle}" />
-                        <muxc:NumberBox x:Uid="Globals_InitialRowsBox"
-                                        Grid.Row="1"
-                                        Grid.Column="1"
-                                        VerticalAlignment="Center"
-                                        Maximum="999"
-                                        Minimum="1"
-                                        Style="{StaticResource LaunchSizeNumberBoxStyle}"
-                                        Value="{x:Bind ViewModel.InitialRows, Mode=TwoWay}" />
+                                        Width="118"
+                                        IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.UseDefaultLaunchPosition), Mode=OneWay}"
+                                        Style="{StaticResource LaunchPositionNumberBoxStyle}"
+                                        Value="{x:Bind ViewModel.InitialPosY, Mode=TwoWay}" />
+                        <CheckBox x:Name="UseDefaultLaunchPositionCheckbox"
+                                  x:Uid="Globals_DefaultLaunchPositionCheckbox"
+                                  Grid.Row="1"
+                                  Grid.Column="0"
+                                  Grid.ColumnSpan="2"
+                                  IsChecked="{x:Bind ViewModel.UseDefaultLaunchPosition, Mode=TwoWay}" />
                     </Grid>
-                </local:SettingContainer>
-            </StackPanel>
-
-            <!--  Section: System & input defaults  -->
-            <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock x:Uid="Launch_Section_SystemInputDefaults"
-                           Style="{StaticResource TextBlockSubHeaderStyle}" />
-                <!--  Default Terminal  -->
-                <local:SettingContainer x:Name="DefaultTerminalDropdown"
-                                        x:Uid="Globals_DefaultTerminal"
-                                        x:Load="false">
-                    <ComboBox x:Name="DefaultTerminal"
-                              ItemsSource="{x:Bind ViewModel.DefaultTerminals}"
-                              SelectedItem="{x:Bind ViewModel.CurrentDefaultTerminal, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}">
-                        <ComboBox.ItemTemplate>
-                            <DataTemplate x:DataType="SettingsModel:DefaultTerminal">
-                                <Grid HorizontalAlignment="Stretch"
-                                      VerticalAlignment="Stretch"
-                                      ColumnSpacing="8">
-
-                                    <Grid.ColumnDefinitions>
-                                        <!--  icon  -->
-                                        <ColumnDefinition Width="auto" />
-                                        <!--  terminal name and author  -->
-                                        <ColumnDefinition Width="auto" />
-                                        <!--  version  -->
-                                        <ColumnDefinition Width="auto" />
-                                    </Grid.ColumnDefinitions>
-
-                                    <Grid.RowDefinitions>
-                                        <!--  terminal name  -->
-                                        <RowDefinition Height="auto" />
-                                        <!--  author and version  -->
-                                        <RowDefinition Height="auto" />
-                                    </Grid.RowDefinitions>
-
-                                    <IconSourceElement Grid.Row="0"
-                                                       Grid.RowSpan="2"
-                                                       Grid.Column="0"
-                                                       Width="24"
-                                                       Height="24"
-                                                       VerticalAlignment="Center"
-                                                       IconSource="{x:Bind mtu:IconPathConverter.IconSourceWUX(Icon), Mode=OneTime}" />
-
-                                    <TextBlock Grid.Row="0"
-                                               Grid.Column="1"
-                                               Grid.ColumnSpan="2"
-                                               VerticalAlignment="Center"
-                                               AutomationProperties.AccessibilityView="Raw"
-                                               Text="{x:Bind Name}" />
-
-                                    <TextBlock Grid.Row="1"
-                                               Grid.Column="1"
-                                               AutomationProperties.AccessibilityView="Raw"
-                                               Style="{ThemeResource SecondaryTextBlockStyle}"
-                                               Text="{x:Bind Author}"
-                                               Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Author)}" />
-
-                                    <TextBlock Grid.Row="1"
-                                               Grid.Column="2"
-                                               AutomationProperties.AccessibilityView="Raw"
-                                               Style="{ThemeResource SecondaryTextBlockStyle}"
-                                               Text="{x:Bind Version}"
-                                               Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Version)}" />
-
-                                </Grid>
-                            </DataTemplate>
-                        </ComboBox.ItemTemplate>
-                    </ComboBox>
-                </local:SettingContainer>
-
-                <!--  Language  -->
-                <local:SettingContainer x:Name="Language"
-                                        x:Uid="Globals_Language">
-                    <ComboBox ItemsSource="{x:Bind ViewModel.LanguageList}"
-                              SelectedItem="{x:Bind ViewModel.CurrentLanguage, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}">
-                        <ComboBox.ItemTemplate>
-                            <DataTemplate x:DataType="x:String">
-                                <TextBlock Text="{x:Bind local:LaunchViewModel.LanguageDisplayConverter((x:String))}" />
-                            </DataTemplate>
-                        </ComboBox.ItemTemplate>
-                    </ComboBox>
-                </local:SettingContainer>
-
-                <!--  Default IME Input Mode  -->
-                <local:SettingContainer x:Name="DefaultInputScope"
-                                        x:Uid="Globals_DefaultInputScope">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
-                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind ViewModel.DefaultInputScopeList}"
-                              SelectedItem="{x:Bind ViewModel.CurrentDefaultInputScope, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
-            </StackPanel>
+                    <TextBlock x:Uid="Globals_CenterOnLaunch"
+                               Grid.Row="2"
+                               Grid.Column="0"
+                               VerticalAlignment="Center" />
+                    <ToggleSwitch x:Name="CenterOnLaunchToggle"
+                                  Grid.Row="2"
+                                  Grid.Column="1"
+                                  IsOn="{x:Bind ViewModel.CenterOnLaunch, Mode=TwoWay}"
+                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+                </Grid>
+            </local:SettingContainer>
         </StackPanel>
     </StackPanel>
 </Page>

src/cascadia/TerminalSettingsEditor/MainPage.cpp

@@ -7,6 +7,8 @@
 #include "Launch.h"
 #include "Interaction.h"
 #include "Compatibility.h"
+#include "Rendering.h"
+#include "RenderingViewModel.h"
 #include "Extensions.h"
 #include "Actions.h"
 #include "ProfileViewModel.h"
@@ -15,7 +17,6 @@
 #include "ColorSchemes.h"
 #include "EditColorScheme.h"
 #include "AddProfile.h"
-#include "Profiles.h"
 #include "InteractionViewModel.h"
 #include "LaunchViewModel.h"
 #include "NewTabMenuViewModel.h"
@@ -27,8 +28,6 @@
 #include <dwmapi.h>
 #include <fmt/compile.h>
 
-#include <winrt/Windows.UI.Xaml.Media.Animation.h>
-
 namespace winrt
 {
     namespace MUX = Microsoft::UI::Xaml;
@@ -41,7 +40,6 @@ using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace winrt::Windows::UI::Core;
 using namespace winrt::Windows::System;
 using namespace winrt::Windows::UI::Xaml::Controls;
-using namespace winrt::Windows::UI::Xaml::Media::Animation;
 using namespace winrt::Windows::Foundation::Collections;
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
@@ -104,7 +102,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     MainPage::MainPage(const CascadiaSettings& settings) :
         _settingsSource{ settings },
         _settingsClone{ settings.Copy() },
-        _profilesPageVM{ winrt::make<ProfilesPageViewModel>() }
+        _profileVMs{ single_threaded_observable_vector<Editor::ProfileViewModel>() }
     {
         InitializeComponent();
         _UpdateBackgroundForMica();
@@ -118,17 +116,14 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 {
                     _breadcrumbs.Append(winrt::make<Breadcrumb>(box_value(currentFolder), currentFolder.Name(), BreadcrumbSubPage::NewTabMenu_Folder));
                     SettingsMainPage_ScrollViewer().ScrollToVerticalOffset(0);
-                    _navDirection = NavDirection::Forward;
                 }
                 else
                 {
                     // If we don't have a current folder, we're at the root of the NTM
                     _breadcrumbs.Clear();
                     _breadcrumbs.Append(winrt::make<Breadcrumb>(box_value(newTabMenuTag), RS_(L"Nav_NewTabMenu/Content"), BreadcrumbSubPage::None));
-                    _navDirection = NavDirection::Back;
                 }
-                const auto resetDir = wil::scope_exit([this]() noexcept { _navDirection = NavDirection::Default; });
-                contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToPageArgs>(_newTabMenuPageVM, *this), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToPageArgs>(_newTabMenuPageVM, *this));
             }
         });
 
@@ -150,24 +145,19 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 {
                     _breadcrumbs.Append(winrt::make<Breadcrumb>(box_value(currentExtensionPackage), currentExtensionPackage.DisplayName(), BreadcrumbSubPage::Extensions_Extension));
                     SettingsMainPage_ScrollViewer().ScrollToVerticalOffset(0);
-                    _navDirection = NavDirection::Forward;
                 }
                 else
                 {
                     // If we don't have a current extension package, we're at the root of the Extensions page
                     _breadcrumbs.Clear();
                     _breadcrumbs.Append(winrt::make<Breadcrumb>(box_value(extensionsTag), RS_(L"Nav_Extensions/Content"), BreadcrumbSubPage::None));
-                    _navDirection = NavDirection::Back;
                 }
-                const auto resetDir = wil::scope_exit([this]() noexcept { _navDirection = NavDirection::Default; });
-                contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToPageArgs>(_extensionsVM, *this), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToPageArgs>(_extensionsVM, *this));
             }
         });
 
-        _SetupProfilesPageEventHandling();
-
         // Make sure to initialize the profiles _after_ we have initialized the color schemes page VM, because we pass
-        // that VM into the appearance VMs within the profiles. The Profiles VM owns the per-profile list itself.
+        // that VM into the appearance VMs within the profiles
         _InitializeProfilesList();
 
         // Apply icons and tooltips (GH#19688, long names may be truncated) to static nav items
@@ -215,17 +205,28 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         _UpdateBackgroundForMica();
 
-        // Capture data about where we are right now, so we can re-navigate to the same
-        // place after we rebuild all the settings.
-        IInspectable destination{ nullptr };
-        auto subPage = BreadcrumbSubPage::None;
-        if (const auto size = _breadcrumbs.Size(); size > 0)
+        // Deduce information about the currently selected item
+        IInspectable lastBreadcrumb;
+        const auto size = _breadcrumbs.Size();
+        if (size > 0)
         {
-            const auto& crumb = _breadcrumbs.GetAt(size - 1).as<Breadcrumb>();
-            destination = crumb->Tag();
-            subPage = crumb->SubPage();
+            lastBreadcrumb = _breadcrumbs.GetAt(size - 1);
         }
 
+        // Collect only the first items out of the menu item source, the static
+        // ones that we don't want to regenerate.
+        //
+        // By manipulating a MenuItemsSource this way, rather than manipulating the
+        // MenuItems directly, we avoid a crash in WinUI.
+        //
+        // By making the vector only _originalNumItems big to start, GetMany
+        // will only fill that number of elements out of the current source.
+        std::vector<IInspectable> menuItemsSTL(_originalNumItems, nullptr);
+        _menuItemSource.GetMany(0, menuItemsSTL);
+        // now, just stick them back in.
+        _menuItemSource.ReplaceAll(menuItemsSTL);
+
+        // Repopulate profile-related menu items
         _InitializeProfilesList();
 
         // Update the Nav State with the new version of the settings
@@ -235,41 +236,64 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _extensionsVM.UpdateSettings(_settingsClone, _colorSchemesPageVM);
         _profileDefaultsVM = nullptr; // Lazy-loaded upon navigation
 
-        if (const auto& profileTag{ destination.try_as<Editor::ProfileViewModel>() })
+        // Now that the menuItems are repopulated,
+        // refresh the current page using the breadcrumb data we collected before the refresh
+        if (const auto& crumb{ lastBreadcrumb.try_as<Breadcrumb>() }; crumb && crumb->Tag())
         {
-            // Find the new profile VM by guid
-            if (const auto newProfileVM = _FindProfileViewModelByGuid(profileTag.OriginalProfileGuid()))
+            bool foundNavigationParams = false;
+            auto destination = crumb->Tag();
+            auto subPage = crumb->SubPage();
+            for (const auto& item : _menuItemSource)
             {
-                destination = newProfileVM;
-            }
-            else
-            {
-                // Fall back to the Profiles landing page
-                destination = box_value(profilesTag);
-                subPage = BreadcrumbSubPage::None;
-            }
-        }
-        else if (destination.try_as<Editor::FolderEntryViewModel>())
-        {
-            destination = box_value(newTabMenuTag);
-            subPage = BreadcrumbSubPage::NewTabMenu_Folder;
-        }
-        else if (destination.try_as<Editor::ExtensionPackageViewModel>())
-        {
-            destination = box_value(extensionsTag);
-            subPage = BreadcrumbSubPage::Extensions_Extension;
-        }
-        else if (!destination.try_as<hstring>())
-        {
-            // Couldn't find a meaningful previous page. Fall back to the first menu item.
-            if (_menuItemSource && _menuItemSource.Size() > 0)
-            {
-                destination = _menuItemSource.GetAt(0).as<MUX::Controls::NavigationViewItem>().Tag();
-                subPage = BreadcrumbSubPage::None;
+                const auto menuItem = item.try_as<MUX::Controls::NavigationViewItem>();
+                if (!menuItem)
+                {
+                    continue;
+                }
+
+                const auto& tag = menuItem.Tag();
+                if (const auto& stringTag{ tag.try_as<hstring>() })
+                {
+                    if (const auto& destString{ destination.try_as<hstring>() })
+                    {
+                        foundNavigationParams = (*stringTag == *destString);
+                    }
+                    else if (destination.try_as<Editor::FolderEntryViewModel>() && *stringTag == newTabMenuTag)
+                    {
+                        foundNavigationParams = true;
+                        subPage = BreadcrumbSubPage::NewTabMenu_Folder;
+                    }
+                    else if (destination.try_as<Editor::ExtensionPackageViewModel>() && *stringTag == extensionsTag)
+                    {
+                        foundNavigationParams = true;
+                        subPage = BreadcrumbSubPage::Extensions_Extension;
+                    }
+                }
+                else if (const auto& profileTag{ tag.try_as<ProfileViewModel>() })
+                {
+                    const auto destProfile = destination.try_as<ProfileViewModel>();
+                    if (destProfile && profileTag->OriginalProfileGuid() == destProfile->OriginalProfileGuid())
+                    {
+                        // Use the new profile VM from the refreshed menu items
+                        destination = tag;
+                        foundNavigationParams = true;
+                    }
+                }
+
+                if (foundNavigationParams)
+                {
+                    // found the one that was selected before the refresh
+                    _Navigate(destination, subPage);
+                    return;
+                }
             }
         }
 
-        _Navigate(destination, subPage);
+        // Couldn't find the selected item, fall back to first menu item
+        // This happens when the selected item was a profile which doesn't exist in the new configuration
+        // We can use menuItemsSTL here because the only things they miss are profile entries.
+        const auto& firstItem{ _menuItemSource.GetAt(0).as<MUX::Controls::NavigationViewItem>() };
+        _Navigate(firstItem.Tag(), BreadcrumbSubPage::None);
 
         _UpdateSearchIndex();
     }
@@ -301,6 +325,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     //                can be empty to indicate that we should create a fresh profile
     void MainPage::_AddProfileHandler(winrt::guid profileGuid)
     {
+        uint32_t insertIndex;
+        auto selectedItem{ SettingsNav().SelectedItem() };
+        if (_menuItemSource)
+        {
+            _menuItemSource.IndexOf(selectedItem, insertIndex);
+        }
         if (profileGuid != winrt::guid{})
         {
             // if we were given a non-empty guid, we want to duplicate the corresponding profile
@@ -308,13 +338,13 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             if (profile)
             {
                 const auto duplicated = _settingsClone.DuplicateProfile(profile);
-                _CreateAndNavigateToNewProfile(duplicated);
+                _CreateAndNavigateToNewProfile(insertIndex, duplicated);
             }
         }
         else
         {
             // we were given an empty guid, create a new profile
-            _CreateAndNavigateToNewProfile(nullptr);
+            _CreateAndNavigateToNewProfile(insertIndex, nullptr);
         }
     }
 
@@ -416,15 +446,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 const auto currentScheme = _colorSchemesPageVM.CurrentScheme();
                 if (_colorSchemesPageVM.CurrentPage() == ColorSchemesSubPage::EditColorScheme && currentScheme)
                 {
-                    _navDirection = NavDirection::Forward;
-                    const auto resetDir = wil::scope_exit([this]() noexcept { _navDirection = NavDirection::Default; });
-                    contentFrame().Navigate(xaml_typename<Editor::EditColorScheme>(), winrt::make<NavigateToPageArgs>(currentScheme, *this), _MakeTransitionInfo());
+                    contentFrame().Navigate(xaml_typename<Editor::EditColorScheme>(), winrt::make<NavigateToPageArgs>(currentScheme, *this));
                     _breadcrumbs.Append(winrt::make<Breadcrumb>(boxedTag, currentScheme.Name(), BreadcrumbSubPage::ColorSchemes_Edit));
                 }
                 else if (_colorSchemesPageVM.CurrentPage() == ColorSchemesSubPage::Base)
                 {
-                    _navDirection = NavDirection::Back;
-                    const auto resetDir = wil::scope_exit([this]() noexcept { _navDirection = NavDirection::Default; });
                     _Navigate(boxedTag, BreadcrumbSubPage::None);
                 }
             }
@@ -445,15 +471,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 const auto boxedTag = box_value(actionsTag);
                 if (_actionsVM.CurrentPage() == ActionsSubPage::Edit)
                 {
-                    _navDirection = NavDirection::Forward;
-                    const auto resetDir = wil::scope_exit([this]() noexcept { _navDirection = NavDirection::Default; });
-                    contentFrame().Navigate(xaml_typename<Editor::EditAction>(), winrt::make<NavigateToPageArgs>(_actionsVM.CurrentCommand(), *this), _MakeTransitionInfo());
+                    contentFrame().Navigate(xaml_typename<Editor::EditAction>(), winrt::make<NavigateToPageArgs>(_actionsVM.CurrentCommand(), *this));
                     _breadcrumbs.Append(winrt::make<Breadcrumb>(boxedTag, RS_(L"Nav_EditAction/Content"), BreadcrumbSubPage::Actions_Edit));
                 }
                 else if (_actionsVM.CurrentPage() == ActionsSubPage::Base)
                 {
-                    _navDirection = NavDirection::Back;
-                    const auto resetDir = wil::scope_exit([this]() noexcept { _navDirection = NavDirection::Default; });
                     _Navigate(boxedTag, BreadcrumbSubPage::None);
                 }
             }
@@ -464,21 +486,21 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     {
         if (page == ProfileSubPage::Base)
         {
-            contentFrame().Navigate(xaml_typename<Editor::Profiles_Base>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus), _MakeTransitionInfo());
+            contentFrame().Navigate(xaml_typename<Editor::Profiles_Base>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus));
         }
         else if (page == ProfileSubPage::Appearance)
         {
-            contentFrame().Navigate(xaml_typename<Editor::Profiles_Appearance>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus), _MakeTransitionInfo());
+            contentFrame().Navigate(xaml_typename<Editor::Profiles_Appearance>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus));
             _breadcrumbs.Append(winrt::make<Breadcrumb>(breadcrumbTag, RS_(L"Profile_Appearance/Header"), BreadcrumbSubPage::Profile_Appearance));
         }
         else if (page == ProfileSubPage::Terminal)
         {
-            contentFrame().Navigate(xaml_typename<Editor::Profiles_Terminal>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus), _MakeTransitionInfo());
+            contentFrame().Navigate(xaml_typename<Editor::Profiles_Terminal>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus));
             _breadcrumbs.Append(winrt::make<Breadcrumb>(breadcrumbTag, RS_(L"Profile_Terminal/Header"), BreadcrumbSubPage::Profile_Terminal));
         }
         else if (page == ProfileSubPage::Advanced)
         {
-            contentFrame().Navigate(xaml_typename<Editor::Profiles_Advanced>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus), _MakeTransitionInfo());
+            contentFrame().Navigate(xaml_typename<Editor::Profiles_Advanced>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus));
             _breadcrumbs.Append(winrt::make<Breadcrumb>(breadcrumbTag, RS_(L"Profile_Advanced/Header"), BreadcrumbSubPage::Profile_Advanced));
         }
         SettingsMainPage_ScrollViewer().ScrollToVerticalOffset(0);
@@ -499,15 +521,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 if (currentPage == ProfileSubPage::Base)
                 {
                     _breadcrumbs.Clear();
-                    _AppendProfilesRootCrumb();
                     _breadcrumbs.Append(winrt::make<Breadcrumb>(breadcrumbTag, breadcrumbText, BreadcrumbSubPage::None));
-                    _navDirection = NavDirection::Back;
                 }
-                else
-                {
-                    _navDirection = NavDirection::Forward;
-                }
-                const auto resetDir = wil::scope_exit([this]() noexcept { _navDirection = NavDirection::Default; });
                 _NavigateToProfileSubPage(profile, currentPage, breadcrumbTag, {});
             }
         });
@@ -531,17 +546,22 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             selectedNavTag = *clickedItemTag;
             if (*clickedItemTag == launchTag)
             {
-                contentFrame().Navigate(xaml_typename<Editor::Launch>(), winrt::make<NavigateToPageArgs>(winrt::make<LaunchViewModel>(_settingsClone), *this, elementToFocus), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::Launch>(), winrt::make<NavigateToPageArgs>(winrt::make<LaunchViewModel>(_settingsClone), *this, elementToFocus));
                 _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, RS_(L"Nav_Launch/Content"), BreadcrumbSubPage::None));
             }
             else if (*clickedItemTag == interactionTag)
             {
-                contentFrame().Navigate(xaml_typename<Editor::Interaction>(), winrt::make<NavigateToPageArgs>(winrt::make<InteractionViewModel>(_settingsClone.GlobalSettings()), *this, elementToFocus), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::Interaction>(), winrt::make<NavigateToPageArgs>(winrt::make<InteractionViewModel>(_settingsClone.GlobalSettings()), *this, elementToFocus));
                 _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, RS_(L"Nav_Interaction/Content"), BreadcrumbSubPage::None));
             }
+            else if (*clickedItemTag == renderingTag)
+            {
+                contentFrame().Navigate(xaml_typename<Editor::Rendering>(), winrt::make<NavigateToPageArgs>(winrt::make<RenderingViewModel>(_settingsClone), *this, elementToFocus));
+                _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, RS_(L"Nav_Rendering/Content"), BreadcrumbSubPage::None));
+            }
             else if (*clickedItemTag == compatibilityTag)
             {
-                contentFrame().Navigate(xaml_typename<Editor::Compatibility>(), winrt::make<NavigateToPageArgs>(winrt::make<CompatibilityViewModel>(_settingsClone), *this, elementToFocus), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::Compatibility>(), winrt::make<NavigateToPageArgs>(winrt::make<CompatibilityViewModel>(_settingsClone), *this, elementToFocus));
                 _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, RS_(L"Nav_Compatibility/Content"), BreadcrumbSubPage::None));
             }
             else if (*clickedItemTag == actionsTag)
@@ -555,7 +575,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                     // Navigate directly to EditAction instead of relying on PropertyChanged,
                     // which won't fire if CurrentPage is already Edit
                     _actionsVM.CurrentPage(ActionsSubPage::Edit);
-                    contentFrame().Navigate(xaml_typename<Editor::EditAction>(), winrt::make<NavigateToPageArgs>(_actionsVM.CurrentCommand(), *this, elementToFocus), _MakeTransitionInfo());
+                    contentFrame().Navigate(xaml_typename<Editor::EditAction>(), winrt::make<NavigateToPageArgs>(_actionsVM.CurrentCommand(), *this, elementToFocus));
                     _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, RS_(L"Nav_EditAction/Content"), BreadcrumbSubPage::Actions_Edit));
 
                     // Re-register the handler for future user-driven changes
@@ -563,7 +583,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 }
                 else
                 {
-                    contentFrame().Navigate(xaml_typename<Editor::Actions>(), winrt::make<NavigateToPageArgs>(_actionsVM, *this, elementToFocus), _MakeTransitionInfo());
+                    contentFrame().Navigate(xaml_typename<Editor::Actions>(), winrt::make<NavigateToPageArgs>(_actionsVM, *this, elementToFocus));
                     _actionsVM.CurrentPage(ActionsSubPage::Base);
                 }
             }
@@ -578,7 +598,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 else
                 {
                     // Navigate to the NewTabMenu page
-                    contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToPageArgs>(_newTabMenuPageVM, *this, elementToFocus), _MakeTransitionInfo());
+                    contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToPageArgs>(_newTabMenuPageVM, *this, elementToFocus));
                     _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, RS_(L"Nav_NewTabMenu/Content"), BreadcrumbSubPage::None));
                 }
             }
@@ -592,19 +612,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 }
                 else
                 {
-                    contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToPageArgs>(_extensionsVM, *this, elementToFocus), _MakeTransitionInfo());
+                    contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToPageArgs>(_extensionsVM, *this, elementToFocus));
                     _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, RS_(L"Nav_Extensions/Content"), BreadcrumbSubPage::None));
                 }
             }
-            else if (*clickedItemTag == profilesTag)
-            {
-                contentFrame().Navigate(xaml_typename<Editor::Profiles>(), winrt::make<NavigateToPageArgs>(_profilesPageVM, *this, elementToFocus));
-                _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, RS_(L"Nav_Profiles/Content"), BreadcrumbSubPage::None));
-            }
             else if (*clickedItemTag == globalProfileTag)
             {
-                _AppendProfilesRootCrumb();
-
                 // lazy load profile defaults VM
                 if (!_profileDefaultsVM)
                 {
@@ -623,17 +636,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
                 // Register handler for future user-driven sub-page changes
                 _SetupProfileEventHandling(_profileDefaultsVM);
-
-                // Keep the Profiles nav item selected.
-                selectedNavTag = profilesTag;
             }
             else if (*clickedItemTag == colorSchemesTag)
             {
-                _AppendProfilesRootCrumb();
-                selectedNavTag = profilesTag;
-
                 _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, RS_(L"Nav_ColorSchemes/Content"), BreadcrumbSubPage::None));
-                contentFrame().Navigate(xaml_typename<Editor::ColorSchemes>(), winrt::make<NavigateToPageArgs>(_colorSchemesPageVM, *this, elementToFocus), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::ColorSchemes>(), winrt::make<NavigateToPageArgs>(_colorSchemesPageVM, *this, elementToFocus));
 
                 if (subPage == BreadcrumbSubPage::ColorSchemes_Edit)
                 {
@@ -642,63 +649,57 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             }
             else if (*clickedItemTag == globalAppearanceTag)
             {
-                contentFrame().Navigate(xaml_typename<Editor::GlobalAppearance>(), winrt::make<NavigateToPageArgs>(winrt::make<GlobalAppearanceViewModel>(_settingsClone.GlobalSettings()), *this, elementToFocus), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::GlobalAppearance>(), winrt::make<NavigateToPageArgs>(winrt::make<GlobalAppearanceViewModel>(_settingsClone.GlobalSettings()), *this, elementToFocus));
                 _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, RS_(L"Nav_Appearance/Content"), BreadcrumbSubPage::None));
             }
             else if (*clickedItemTag == addProfileTag)
             {
-                _AppendProfilesRootCrumb();
-
                 auto addProfileState{ winrt::make<AddProfilePageNavigationState>(_settingsClone) };
                 addProfileState.AddNew({ get_weak(), &MainPage::_AddProfileHandler });
-                contentFrame().Navigate(xaml_typename<Editor::AddProfile>(), winrt::make<NavigateToPageArgs>(addProfileState, *this, elementToFocus), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::AddProfile>(), winrt::make<NavigateToPageArgs>(addProfileState, *this, elementToFocus));
                 _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, RS_(L"Nav_AddNewProfile/Content"), BreadcrumbSubPage::None));
-
-                // Keep the Profiles nav item selected.
-                selectedNavTag = profilesTag;
             }
         }
         else if (const auto& profile = vm.try_as<Editor::ProfileViewModel>())
         {
-            _AppendProfilesRootCrumb();
-            selectedNavTag = profilesTag;
-
             if (profile.Orphaned())
             {
-                contentFrame().Navigate(xaml_typename<Editor::Profiles_Base_Orphaned>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::Profiles_Base_Orphaned>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus));
                 _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, profile.Name(), BreadcrumbSubPage::None));
                 profile.CurrentPage(ProfileSubPage::Base);
                 _SetupProfileEventHandling(profile);
+                return;
             }
-            else
+
+            // Set CurrentPage before registering the handler to avoid double-navigation
+            const ProfileSubPage profileSubPage = ProfileSubPageFromBreadcrumb(subPage);
+            profile.CurrentPage(profileSubPage);
+
+            // Navigate directly to the correct sub-page
+            _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, profile.Name(), BreadcrumbSubPage::None));
+            _NavigateToProfileSubPage(profile, profileSubPage, vm, elementToFocus);
+
+            if (const auto profileNavItem = _FindProfileNavItem(profile.OriginalProfileGuid()))
             {
-                // Set CurrentPage before registering the handler to avoid double-navigation
-                const ProfileSubPage profileSubPage = ProfileSubPageFromBreadcrumb(subPage);
-                profile.CurrentPage(profileSubPage);
-
-                // Navigate directly to the correct sub-page
-                _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, profile.Name(), BreadcrumbSubPage::None));
-                _NavigateToProfileSubPage(profile, profileSubPage, vm, elementToFocus);
-
-                // Register handler for future user-driven sub-page changes
-                _SetupProfileEventHandling(profile);
+                SettingsNav().SelectedItem(profileNavItem);
             }
+
+            // Register handler for future user-driven sub-page changes
+            _SetupProfileEventHandling(profile);
         }
         else if (const auto& colorSchemeVM = vm.try_as<Editor::ColorSchemeViewModel>())
         {
+            selectedNavTag = colorSchemesTag;
             const auto boxedColorSchemesTag = box_value(colorSchemesTag);
 
             // Suppress the handler to avoid double-navigation
             _colorSchemesPageViewModelChangedRevoker.revoke();
 
-            _AppendProfilesRootCrumb();
-            selectedNavTag = profilesTag;
-
             _breadcrumbs.Append(winrt::make<Breadcrumb>(boxedColorSchemesTag, RS_(L"Nav_ColorSchemes/Content"), BreadcrumbSubPage::None));
 
             if (subPage == BreadcrumbSubPage::None)
             {
-                contentFrame().Navigate(xaml_typename<Editor::ColorSchemes>(), winrt::make<NavigateToPageArgs>(_colorSchemesPageVM, *this, elementToFocus), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::ColorSchemes>(), winrt::make<NavigateToPageArgs>(_colorSchemesPageVM, *this, elementToFocus));
                 _colorSchemesPageVM.CurrentScheme(nullptr);
                 _colorSchemesPageVM.CurrentPage(ColorSchemesSubPage::Base);
             }
@@ -706,7 +707,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             {
                 _colorSchemesPageVM.CurrentScheme(colorSchemeVM);
                 _colorSchemesPageVM.CurrentPage(ColorSchemesSubPage::EditColorScheme);
-                contentFrame().Navigate(xaml_typename<Editor::EditColorScheme>(), winrt::make<NavigateToPageArgs>(colorSchemeVM, *this, elementToFocus), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::EditColorScheme>(), winrt::make<NavigateToPageArgs>(colorSchemeVM, *this, elementToFocus));
                 _breadcrumbs.Append(winrt::make<Breadcrumb>(boxedColorSchemesTag, colorSchemeVM.Name(), BreadcrumbSubPage::ColorSchemes_Edit));
             }
 
@@ -717,7 +718,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         {
             selectedNavTag = newTabMenuTag;
 
-            contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToPageArgs>(_newTabMenuPageVM, *this, elementToFocus), _MakeTransitionInfo());
+            contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToPageArgs>(_newTabMenuPageVM, *this, elementToFocus));
             _breadcrumbs.Append(winrt::make<Breadcrumb>(box_value(newTabMenuTag), RS_(L"Nav_NewTabMenu/Content"), BreadcrumbSubPage::None));
 
             if (subPage == BreadcrumbSubPage::None)
@@ -748,7 +749,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         {
             selectedNavTag = extensionsTag;
 
-            contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToPageArgs>(_extensionsVM, *this, elementToFocus), _MakeTransitionInfo());
+            contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToPageArgs>(_extensionsVM, *this, elementToFocus));
             _breadcrumbs.Append(winrt::make<Breadcrumb>(box_value(extensionsTag), RS_(L"Nav_Extensions/Content"), BreadcrumbSubPage::None));
 
             if (subPage == BreadcrumbSubPage::None)
@@ -793,7 +794,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
             if (subPage == BreadcrumbSubPage::None || !commandVM)
             {
-                contentFrame().Navigate(xaml_typename<Editor::Actions>(), winrt::make<NavigateToPageArgs>(_actionsVM, *this, elementToFocus), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::Actions>(), winrt::make<NavigateToPageArgs>(_actionsVM, *this, elementToFocus));
                 _actionsVM.CurrentCommand(nullptr);
             }
             else
@@ -803,7 +804,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
                 _actionsVM.CurrentCommand(commandVM);
                 _actionsVM.CurrentPage(ActionsSubPage::Edit);
-                contentFrame().Navigate(xaml_typename<Editor::EditAction>(), winrt::make<NavigateToPageArgs>(commandVM, *this, elementToFocus), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::EditAction>(), winrt::make<NavigateToPageArgs>(commandVM, *this, elementToFocus));
                 _breadcrumbs.Append(winrt::make<Breadcrumb>(boxedActionsTag, RS_(L"Nav_EditAction/Content"), BreadcrumbSubPage::Actions_Edit));
 
                 // Re-register the handler for future user-driven changes
@@ -812,9 +813,26 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }
 
         // Select the appropriate nav item
+        // NOTE: profiles are special in that they have their own nav item, so those are handled in the profile branch above
         if (!selectedNavTag.empty())
         {
-            _SelectNavItemByTag(selectedNavTag);
+            for (auto&& menuItem : _menuItemSource)
+            {
+                if (const auto& navViewItem{ menuItem.try_as<MUX::Controls::NavigationViewItem>() })
+                {
+                    if (const auto& tag{ navViewItem.Tag() })
+                    {
+                        if (const auto& stringTag{ tag.try_as<hstring>() })
+                        {
+                            if (*stringTag == selectedNavTag)
+                            {
+                                SettingsNav().SelectedItem(navViewItem);
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
         }
     }
 
@@ -836,34 +854,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     {
         if (gsl::narrow_cast<uint32_t>(args.Index()) < (_breadcrumbs.Size() - 1))
         {
-            _navDirection = NavDirection::Back;
-            const auto resetDir = wil::scope_exit([this]() noexcept { _navDirection = NavDirection::Default; });
             const auto crumb = args.Item().as<Breadcrumb>();
             _Navigate(crumb->Tag(), crumb->SubPage());
         }
     }
 
-    NavigationTransitionInfo MainPage::_MakeTransitionInfo() const
-    {
-        switch (_navDirection)
-        {
-        case NavDirection::Forward:
-        {
-            SlideNavigationTransitionInfo info;
-            info.Effect(SlideNavigationTransitionEffect::FromRight);
-            return info;
-        }
-        case NavDirection::Back:
-        {
-            SlideNavigationTransitionInfo info;
-            info.Effect(SlideNavigationTransitionEffect::FromLeft);
-            return info;
-        }
-        default:
-            return EntranceNavigationTransitionInfo{};
-        }
-    }
-
     void MainPage::_InitializeProfilesList()
     {
         const auto& itemSource{ SettingsNav().MenuItemsSource() };
@@ -877,20 +872,35 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             _MoveXamlParsedNavItemsIntoItemSource();
         }
 
-        // Populate the per-profile view models on the Profiles VM. The Profiles landing
-        // page (and the search index) read this same list back through the VM.
-        const auto& profileVMs = _profilesPageVM.Profiles();
-        profileVMs.Clear();
+        // Manually create a NavigationViewItem and view model for each profile
+        // and keep a reference to them in a map so that we
+        // can easily modify the correct one when the associated
+        // profile changes.
+        _profileVMs.Clear();
         for (const auto& profile : _settingsClone.AllProfiles())
         {
             if (!profile.Deleted())
             {
                 auto profileVM = _viewModelForProfile(profile, _settingsClone, Dispatcher());
                 profileVM.SetupAppearances(_colorSchemesPageVM.AllColorSchemes());
-                profileVM.DeleteProfileRequested({ this, &MainPage::_DeleteProfile });
-                profileVMs.Append(profileVM);
+                auto navItem = _CreateProfileNavViewItem(profileVM);
+                _menuItemSource.Append(navItem);
             }
         }
+
+        // Top off (the end of the nav view) with the Add Profile item
+        MUX::Controls::NavigationViewItem addProfileItem;
+        const auto addProfileText = RS_(L"Nav_AddNewProfile/Content");
+        addProfileItem.Content(box_value(addProfileText));
+        addProfileItem.Tag(box_value(addProfileTag));
+        WUX::Controls::ToolTipService::SetToolTip(addProfileItem, box_value(addProfileText));
+
+        FontIcon icon;
+        // This is the "Add" symbol
+        icon.Glyph(NavTagIconMap[addProfileTag]);
+        addProfileItem.Icon(icon);
+
+        _menuItemSource.Append(addProfileItem);
     }
 
     // BODGY
@@ -926,17 +936,79 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         SettingsNav().MenuItemsSource(_menuItemSource);
     }
 
-    void MainPage::_CreateAndNavigateToNewProfile(const Model::Profile& profile)
+    void MainPage::_CreateAndNavigateToNewProfile(const uint32_t index, const Model::Profile& profile)
     {
         const auto newProfile{ profile ? profile : _settingsClone.CreateNewProfile() };
         const auto profileViewModel{ _viewModelForProfile(newProfile, _settingsClone, Dispatcher()) };
         profileViewModel.SetupAppearances(_colorSchemesPageVM.AllColorSchemes());
-        profileViewModel.DeleteProfileRequested({ this, &MainPage::_DeleteProfile });
+        const auto navItem{ _CreateProfileNavViewItem(profileViewModel) };
 
-        _profilesPageVM.Profiles().Append(profileViewModel);
+        if (_menuItemSource)
+        {
+            _menuItemSource.InsertAt(index, navItem);
+        }
 
         // Select and navigate to the new profile
-        _Navigate(profileViewModel);
+        _Navigate(profileViewModel, BreadcrumbSubPage::None);
+    }
+
+    static MUX::Controls::InfoBadge _createGlyphIconBadge(wil::zwstring_view glyph)
+    {
+        MUX::Controls::InfoBadge badge;
+        MUX::Controls::FontIconSource icon;
+        icon.FontFamily(winrt::Windows::UI::Xaml::Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
+        icon.FontSize(12);
+        icon.Glyph(glyph);
+        badge.IconSource(icon);
+        return badge;
+    }
+
+    MUX::Controls::NavigationViewItem MainPage::_CreateProfileNavViewItem(const Editor::ProfileViewModel& profile)
+    {
+        MUX::Controls::NavigationViewItem profileNavItem;
+        profileNavItem.Content(box_value(profile.Name()));
+        profileNavItem.Tag(box_value<Editor::ProfileViewModel>(profile));
+        profileNavItem.Icon(UI::IconPathConverter::IconWUX(profile.EvaluatedIcon()));
+        WUX::Controls::ToolTipService::SetToolTip(profileNavItem, box_value(profile.Name()));
+
+        if (profile.Orphaned())
+        {
+            profileNavItem.InfoBadge(_createGlyphIconBadge(L"\xE7BA") /* Warning Triangle */);
+        }
+        else if (profile.Hidden())
+        {
+            profileNavItem.InfoBadge(_createGlyphIconBadge(L"\xED1A") /* Hide */);
+        }
+
+        // Update the menu item when the icon/name changes
+        auto weakMenuItem{ make_weak(profileNavItem) };
+        profile.PropertyChanged([weakMenuItem](const auto&, const WUX::Data::PropertyChangedEventArgs& args) {
+            if (auto menuItem{ weakMenuItem.get() })
+            {
+                const auto& tag{ menuItem.Tag().as<Editor::ProfileViewModel>() };
+                if (args.PropertyName() == L"Icon")
+                {
+                    menuItem.Icon(UI::IconPathConverter::IconWUX(tag.EvaluatedIcon()));
+                }
+                else if (args.PropertyName() == L"Name")
+                {
+                    menuItem.Content(box_value(tag.Name()));
+                    WUX::Controls::ToolTipService::SetToolTip(menuItem, box_value(tag.Name()));
+                }
+                else if (args.PropertyName() == L"Hidden")
+                {
+                    menuItem.InfoBadge(tag.Hidden() ? _createGlyphIconBadge(L"\xED1A") /* Hide */ : nullptr);
+                }
+            }
+        });
+
+        // Add an event handler for when the user wants to delete a profile.
+        profile.DeleteProfileRequested({ this, &MainPage::_DeleteProfile });
+
+        // Register the VM so that it appears in the search index
+        _profileVMs.Append(profile);
+
+        return profileNavItem;
     }
 
     void MainPage::_DeleteProfile(const IInspectable /*sender*/, const Editor::DeleteProfileEventArgs& args)
@@ -953,20 +1025,33 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             }
         }
 
-        // Remove the profile VM
-        const auto& profileVMs = _profilesPageVM.Profiles();
-        for (uint32_t i = 0; i < profileVMs.Size(); ++i)
+        // remove selected item
+        uint32_t index;
+        auto selectedItem{ SettingsNav().SelectedItem() };
+        if (_menuItemSource)
         {
-            if (profileVMs.GetAt(i).OriginalProfileGuid() == guid)
-            {
-                profileVMs.RemoveAt(i);
-                break;
-            }
-        }
+            _menuItemSource.IndexOf(selectedItem, index);
+            _menuItemSource.RemoveAt(index);
 
-        // Go back to the Profiles landing page
-        _Navigate(box_value(profilesTag));
-        SettingsMainPage_ScrollViewer().ChangeView(nullptr, 0.0, nullptr);
+            // Remove it from the list of VMs
+            auto profileVM = selectedItem.as<MUX::Controls::NavigationViewItem>().Tag().as<Editor::ProfileViewModel>();
+            uint32_t vmIndex;
+            if (_menuItemSource.IndexOf(profileVM, vmIndex))
+            {
+                _profileVMs.RemoveAt(vmIndex);
+            }
+
+            // navigate to the profile next to this one
+            const auto newSelectedItem{ _menuItemSource.GetAt(index < _menuItemSource.Size() - 1 ? index : index - 1) };
+            const auto newTag = newSelectedItem.as<MUX::Controls::NavigationViewItem>().Tag();
+            if (const auto profileViewModel = newTag.try_as<ProfileViewModel>())
+            {
+                profileViewModel->FocusDeleteButton(true);
+            }
+            _Navigate(newTag, BreadcrumbSubPage::None);
+            // Since we are navigating to a new profile after deletion, scroll up to the top
+            SettingsMainPage_ScrollViewer().ChangeView(nullptr, 0.0, nullptr);
+        }
     }
 
     IObservableVector<IInspectable> MainPage::Breadcrumbs() noexcept
@@ -976,20 +1061,29 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void MainPage::_NavigateToProfileHandler(const IInspectable& /*sender*/, winrt::guid profileGuid)
     {
-        if (const auto profileVM = _FindProfileViewModelByGuid(profileGuid))
+        if (const auto profileNavItem = _FindProfileNavItem(profileGuid))
         {
-            _Navigate(profileVM);
+            _Navigate(profileNavItem.Tag(), BreadcrumbSubPage::None);
         }
         // Silently fail if the profile wasn't found
     }
 
-    Editor::ProfileViewModel MainPage::_FindProfileViewModelByGuid(winrt::guid profileGuid) const
+    MUX::Controls::NavigationViewItem MainPage::_FindProfileNavItem(winrt::guid profileGuid) const
     {
-        for (const auto& profileVM : _profilesPageVM.Profiles())
+        for (auto&& menuItem : _menuItemSource)
         {
-            if (profileVM.OriginalProfileGuid() == profileGuid)
+            if (const auto& navViewItem{ menuItem.try_as<MUX::Controls::NavigationViewItem>() })
             {
-                return profileVM;
+                if (const auto& tag{ navViewItem.Tag() })
+                {
+                    if (const auto& profileTag{ tag.try_as<ProfileViewModel>() })
+                    {
+                        if (profileTag->OriginalProfileGuid() == profileGuid)
+                        {
+                            return navViewItem;
+                        }
+                    }
+                }
             }
         }
         return nullptr;
@@ -1000,52 +1094,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _Navigate(box_value(hstring{ colorSchemesTag }), BreadcrumbSubPage::ColorSchemes_Edit);
     }
 
-    void MainPage::_AppendProfilesRootCrumb()
-    {
-        _breadcrumbs.Append(winrt::make<Breadcrumb>(box_value(profilesTag), RS_(L"Nav_Profiles/Content"), BreadcrumbSubPage::None));
-    }
-
-    void MainPage::_SelectNavItemByTag(std::wstring_view tag)
-    {
-        if (!_menuItemSource)
-        {
-            return;
-        }
-        for (auto&& menuItem : _menuItemSource)
-        {
-            if (const auto& navViewItem{ menuItem.try_as<MUX::Controls::NavigationViewItem>() })
-            {
-                if (const auto& itemTag{ navViewItem.Tag() })
-                {
-                    if (const auto& stringTag{ itemTag.try_as<hstring>() })
-                    {
-                        if (*stringTag == tag)
-                        {
-                            SettingsNav().SelectedItem(navViewItem);
-                            return;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    void MainPage::_SetupProfilesPageEventHandling()
-    {
-        _profilesPageVM.OpenDefaultsRequested([this](const auto&, const auto&) {
-            _Navigate(box_value(globalProfileTag));
-        });
-        _profilesPageVM.OpenColorSchemesRequested([this](const auto&, const auto&) {
-            _Navigate(box_value(colorSchemesTag));
-        });
-        _profilesPageVM.AddProfileRequested([this](const auto&, const auto&) {
-            _Navigate(box_value(addProfileTag));
-        });
-        _profilesPageVM.OpenProfileRequested([this](const auto&, const Editor::ProfileViewModel& profile) {
-            _Navigate(profile);
-        });
-    }
-
     winrt::Windows::UI::Xaml::Media::Brush MainPage::BackgroundBrush()
     {
         return SettingsNav().Background();
@@ -1148,7 +1196,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             co_return;
         }
         _currentSearch = SearchIndex::Instance().SearchAsync(sanitizedQuery,
-                                                             _profilesPageVM.Profiles().GetView(),
+                                                             _profileVMs.GetView(),
                                                              get_self<implementation::NewTabMenuViewModel>(_newTabMenuPageVM)->FolderTreeFlatList().GetView(),
                                                              _colorSchemesPageVM.AllColorSchemes().GetView(),
                                                              _extensionsVM.ExtensionPackages().GetView(),

src/cascadia/TerminalSettingsEditor/MainPage.h

@@ -84,33 +84,21 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         std::optional<HWND> _hostingHwnd;
 
         void _InitializeProfilesList();
-        void _CreateAndNavigateToNewProfile(const Model::Profile& profile);
+        void _CreateAndNavigateToNewProfile(const uint32_t index, const Model::Profile& profile);
+        winrt::Microsoft::UI::Xaml::Controls::NavigationViewItem _CreateProfileNavViewItem(const Editor::ProfileViewModel& profile);
         void _DeleteProfile(const Windows::Foundation::IInspectable sender, const Editor::DeleteProfileEventArgs& args);
         void _AddProfileHandler(const winrt::guid profileGuid);
 
         void _SetupProfileEventHandling(const winrt::Microsoft::Terminal::Settings::Editor::ProfileViewModel profile);
         void _SetupColorSchemesEventHandling();
         void _SetupActionsEventHandling();
-        void _SetupProfilesPageEventHandling();
         void _NavigateToProfileSubPage(const Editor::ProfileViewModel& profile, ProfileSubPage page, const IInspectable& breadcrumbTag, const hstring& elementToFocus);
 
         void _PreNavigateHelper();
-        void _Navigate(const IInspectable& vm, BreadcrumbSubPage subPage = BreadcrumbSubPage::None, hstring elementToFocus = {});
-        Windows::UI::Xaml::Media::Animation::NavigationTransitionInfo _MakeTransitionInfo() const;
-
-        enum class NavDirection
-        {
-            Default,
-            Forward,
-            Back
-        };
-        NavDirection _navDirection{ NavDirection::Default };
+        void _Navigate(const IInspectable& vm, BreadcrumbSubPage subPage, hstring elementToFocus = {});
         void _NavigateToProfileHandler(const IInspectable& sender, winrt::guid profileGuid);
         void _NavigateToColorSchemeHandler(const IInspectable& sender, const IInspectable& args);
-        Editor::ProfileViewModel _FindProfileViewModelByGuid(winrt::guid profileGuid) const;
-
-        void _AppendProfilesRootCrumb();
-        void _SelectNavItemByTag(std::wstring_view tag);
+        Microsoft::UI::Xaml::Controls::NavigationViewItem _FindProfileNavItem(winrt::guid profileGuid) const;
 
         void _UpdateBackgroundForMica();
         void _MoveXamlParsedNavItemsIntoItemSource();
@@ -118,11 +106,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         safe_void_coroutine _UpdateSearchIndex();
 
         winrt::Microsoft::Terminal::Settings::Editor::ProfileViewModel _profileDefaultsVM{ nullptr };
+        Windows::Foundation::Collections::IVector<winrt::Microsoft::Terminal::Settings::Editor::ProfileViewModel> _profileVMs{ nullptr };
         winrt::Microsoft::Terminal::Settings::Editor::ColorSchemesPageViewModel _colorSchemesPageVM{ nullptr };
         winrt::Microsoft::Terminal::Settings::Editor::ActionsViewModel _actionsVM{ nullptr };
         winrt::Microsoft::Terminal::Settings::Editor::NewTabMenuViewModel _newTabMenuPageVM{ nullptr };
         winrt::Microsoft::Terminal::Settings::Editor::ExtensionsViewModel _extensionsVM{ nullptr };
-        winrt::Microsoft::Terminal::Settings::Editor::ProfilesPageViewModel _profilesPageVM{ nullptr };
 
         Windows::Foundation::IAsyncOperation<Windows::Foundation::Collections::IObservableVector<Windows::Foundation::IInspectable>> _currentSearch{ nullptr };
 

src/cascadia/TerminalSettingsEditor/MainPage.xaml

@@ -162,6 +162,15 @@
                                      x:Uid="Nav_Appearance"
                                      Tag="GlobalAppearance_Nav" />
 
+            <muxc:NavigationViewItem x:Name="ColorSchemesNavItem"
+                                     x:Uid="Nav_ColorSchemes"
+                                     Tag="ColorSchemes_Nav" />
+
+
+            <muxc:NavigationViewItem x:Name="RenderingNavItem"
+                                     x:Uid="Nav_Rendering"
+                                     Tag="Rendering_Nav" />
+
             <muxc:NavigationViewItem x:Name="CompatibilityNavItem"
                                      x:Uid="Nav_Compatibility"
                                      Tag="Compatibility_Nav" />
@@ -183,9 +192,11 @@
                                      x:Uid="Nav_Extensions"
                                      Tag="Extensions_Nav" />
 
-            <muxc:NavigationViewItem x:Name="ProfilesNavItem"
-                                     x:Uid="Nav_Profiles"
-                                     Tag="Profiles_Nav" />
+            <muxc:NavigationViewItemHeader x:Uid="Nav_Profiles" />
+
+            <muxc:NavigationViewItem x:Name="BaseLayerMenuItem"
+                                     x:Uid="Nav_ProfileDefaults"
+                                     Tag="GlobalProfile_Nav" />
         </muxc:NavigationView.MenuItems>
 
         <muxc:NavigationView.FooterMenuItems>
@@ -204,7 +215,17 @@
                           Grid.Row="0">
                 <Frame x:Name="contentFrame"
                        Grid.Row="0"
-                       Padding="16,0,16,48" />
+                       Padding="16,0,16,48">
+                    <Frame.ContentTransitions>
+                        <TransitionCollection>
+                            <NavigationThemeTransition>
+                                <NavigationThemeTransition.DefaultNavigationTransitionInfo>
+                                    <DrillInNavigationTransitionInfo />
+                                </NavigationThemeTransition.DefaultNavigationTransitionInfo>
+                            </NavigationThemeTransition>
+                        </TransitionCollection>
+                    </Frame.ContentTransitions>
+                </Frame>
             </ScrollViewer>
             <!--  Explicitly set the background color on grid to prevent the navigation animation from overflowing it  -->
             <Grid Grid.Row="1"

src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj

@@ -86,9 +86,6 @@
     <ClInclude Include="KeyChordListener.h">
       <DependentUpon>KeyChordListener.xaml</DependentUpon>
     </ClInclude>
-    <ClInclude Include="KeyChordVisual.h">
-      <DependentUpon>KeyChordVisual.xaml</DependentUpon>
-    </ClInclude>
     <ClInclude Include="Launch.h">
       <DependentUpon>Launch.xaml</DependentUpon>
     </ClInclude>
@@ -122,8 +119,8 @@
       <DependentUpon>ColorSchemesPageViewModel.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClInclude>
-    <ClInclude Include="Profiles.h">
-      <DependentUpon>Profiles.xaml</DependentUpon>
+    <ClInclude Include="RenderingViewModel.h">
+      <DependentUpon>RenderingViewModel.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClInclude>
     <ClInclude Include="InteractionViewModel.h">
@@ -170,27 +167,12 @@
       <DependentUpon>Appearances.xaml</DependentUpon>
       <SubType>Code</SubType>
     </ClInclude>
+    <ClInclude Include="Rendering.h">
+      <DependentUpon>Rendering.xaml</DependentUpon>
+    </ClInclude>
     <ClInclude Include="SettingContainer.h">
       <DependentUpon>SettingContainer.idl</DependentUpon>
     </ClInclude>
-    <ClInclude Include="SettingsCard.h">
-      <DependentUpon>SettingsCard.idl</DependentUpon>
-    </ClInclude>
-    <ClInclude Include="SettingsExpander.h">
-      <DependentUpon>SettingsExpander.idl</DependentUpon>
-    </ClInclude>
-    <ClInclude Include="StyleExtensions.h">
-      <DependentUpon>StyleExtensions.idl</DependentUpon>
-    </ClInclude>
-    <ClInclude Include="ControlSizeTrigger.h">
-      <DependentUpon>ControlSizeTrigger.idl</DependentUpon>
-    </ClInclude>
-    <ClInclude Include="CornerRadiusFilterConverters.h">
-      <DependentUpon>CornerRadiusFilterConverters.idl</DependentUpon>
-    </ClInclude>
-    <ClInclude Include="StringDefaultTemplateSelector.h">
-      <DependentUpon>StringDefaultTemplateSelector.idl</DependentUpon>
-    </ClInclude>
     <ClInclude Include="Utils.h" />
     <ClInclude Include="PreviewConnection.h" />
     <ClInclude Include="$(GeneratedFilesDir)GeneratedSettingsIndex.g.h" />
@@ -234,9 +216,6 @@
     <Page Include="KeyChordListener.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="KeyChordVisual.xaml">
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Launch.xaml">
       <SubType>Designer</SubType>
     </Page>
@@ -252,9 +231,6 @@
     <Page Include="Profiles_Base.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Profiles.xaml">
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Profiles_Base_Orphaned.xaml">
       <SubType>Designer</SubType>
     </Page>
@@ -270,15 +246,12 @@
     <Page Include="Appearances.xaml">
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Rendering.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="SettingContainerStyle.xaml">
       <Type>DefaultStyle</Type>
     </Page>
-    <Page Include="SettingsControlsStyle.xaml">
-      <Type>DefaultStyle</Type>
-    </Page>
-    <Page Include="SettingsControlsImplicitStyles.xaml">
-      <Type>DefaultStyle</Type>
-    </Page>
   </ItemGroup>
   <!-- ========================= Cpp Files ======================== -->
   <ItemGroup>
@@ -324,9 +297,6 @@
     <ClCompile Include="KeyChordListener.cpp">
       <DependentUpon>KeyChordListener.xaml</DependentUpon>
     </ClCompile>
-    <ClCompile Include="KeyChordVisual.cpp">
-      <DependentUpon>KeyChordVisual.xaml</DependentUpon>
-    </ClCompile>
     <ClCompile Include="Launch.cpp">
       <DependentUpon>Launch.xaml</DependentUpon>
     </ClCompile>
@@ -361,8 +331,8 @@
       <DependentUpon>ColorSchemesPageViewModel.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
-    <ClCompile Include="Profiles.cpp">
-      <DependentUpon>Profiles.xaml</DependentUpon>
+    <ClCompile Include="RenderingViewModel.cpp">
+      <DependentUpon>RenderingViewModel.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
     <ClCompile Include="InteractionViewModel.cpp">
@@ -409,27 +379,12 @@
       <DependentUpon>Appearances.xaml</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
+    <ClCompile Include="Rendering.cpp">
+      <DependentUpon>Rendering.xaml</DependentUpon>
+    </ClCompile>
     <ClCompile Include="SettingContainer.cpp">
       <DependentUpon>SettingContainer.idl</DependentUpon>
     </ClCompile>
-    <ClCompile Include="SettingsCard.cpp">
-      <DependentUpon>SettingsCard.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="SettingsExpander.cpp">
-      <DependentUpon>SettingsExpander.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="StyleExtensions.cpp">
-      <DependentUpon>StyleExtensions.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="ControlSizeTrigger.cpp">
-      <DependentUpon>ControlSizeTrigger.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="CornerRadiusFilterConverters.cpp">
-      <DependentUpon>CornerRadiusFilterConverters.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="StringDefaultTemplateSelector.cpp">
-      <DependentUpon>StringDefaultTemplateSelector.idl</DependentUpon>
-    </ClCompile>
     <ClCompile Include="Utils.cpp" />
     <ClCompile Include="PreviewConnection.cpp">
       <DependentUpon>PreviewConnection.h</DependentUpon>
@@ -472,10 +427,6 @@
       <DependentUpon>KeyChordListener.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Midl>
-    <Midl Include="KeyChordVisual.idl">
-      <DependentUpon>KeyChordVisual.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Midl>
     <Midl Include="Launch.idl">
       <DependentUpon>Launch.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -492,6 +443,10 @@
       <DependentUpon>Compatibility.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Midl>
+    <Midl Include="Rendering.idl">
+      <DependentUpon>Rendering.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Midl>
     <Midl Include="SearchIndex.idl" />
     <Midl Include="MainPage.idl">
       <DependentUpon>MainPage.xaml</DependentUpon>
@@ -501,10 +456,7 @@
     <Midl Include="TerminalColorConverters.idl" />
     <Midl Include="ColorSchemeViewModel.idl" />
     <Midl Include="ColorSchemesPageViewModel.idl" />
-    <Midl Include="Profiles.idl">
-      <DependentUpon>Profiles.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Midl>
+    <Midl Include="RenderingViewModel.idl" />
     <Midl Include="InteractionViewModel.idl" />
     <Midl Include="GlobalAppearanceViewModel.idl" />
     <Midl Include="LaunchViewModel.idl" />
@@ -540,24 +492,6 @@
     <Midl Include="SettingContainer.idl">
       <SubType>Code</SubType>
     </Midl>
-    <Midl Include="SettingsCard.idl">
-      <SubType>Code</SubType>
-    </Midl>
-    <Midl Include="SettingsExpander.idl">
-      <SubType>Code</SubType>
-    </Midl>
-    <Midl Include="StyleExtensions.idl">
-      <SubType>Code</SubType>
-    </Midl>
-    <Midl Include="ControlSizeTrigger.idl">
-      <SubType>Code</SubType>
-    </Midl>
-    <Midl Include="CornerRadiusFilterConverters.idl">
-      <SubType>Code</SubType>
-    </Midl>
-    <Midl Include="StringDefaultTemplateSelector.idl">
-      <SubType>Code</SubType>
-    </Midl>
   </ItemGroup>
   <!-- ========================= Misc Files ======================== -->
   <ItemGroup>

src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters

@@ -24,17 +24,12 @@
     <Midl Include="ActionsViewModel.idl" />
     <Midl Include="ColorSchemeViewModel.idl" />
     <Midl Include="ColorSchemesPageViewModel.idl" />
+    <Midl Include="RenderingViewModel.idl" />
     <Midl Include="InteractionViewModel.idl" />
     <Midl Include="GlobalAppearanceViewModel.idl" />
     <Midl Include="LaunchViewModel.idl" />
     <Midl Include="EnumEntry.idl" />
     <Midl Include="SettingContainer.idl" />
-    <Midl Include="SettingsCard.idl" />
-    <Midl Include="SettingsExpander.idl" />
-    <Midl Include="StyleExtensions.idl" />
-    <Midl Include="ControlSizeTrigger.idl" />
-    <Midl Include="CornerRadiusFilterConverters.idl" />
-    <Midl Include="StringDefaultTemplateSelector.idl" />
     <Midl Include="TerminalColorConverters.idl" />
     <Midl Include="NewTabMenuViewModel.idl" />
   </ItemGroup>
@@ -53,17 +48,14 @@
     <Page Include="Profiles_Advanced.xaml" />
     <Page Include="Profiles_Appearance.xaml" />
     <Page Include="Appearances.xaml" />
+    <Page Include="Rendering.xaml" />
     <Page Include="Actions.xaml" />
     <Page Include="EditAction.xaml" />
     <Page Include="SettingContainerStyle.xaml" />
-    <Page Include="SettingsControlsStyle.xaml" />
-    <Page Include="SettingsControlsImplicitStyles.xaml" />
     <Page Include="AddProfile.xaml" />
     <Page Include="KeyChordListener.xaml" />
-    <Page Include="KeyChordVisual.xaml" />
     <Page Include="NullableColorPicker.xaml" />
     <Page Include="IconPicker.xaml" />
     <Page Include="NewTabMenu.xaml" />
-    <Page Include="Profiles.xaml" />
   </ItemGroup>
 </Project>

src/cascadia/TerminalSettingsEditor/NavConstants.h

@@ -12,11 +12,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     inline constexpr std::wstring_view openJsonTag{ L"OpenJson_Nav" };
     inline constexpr std::wstring_view launchTag{ L"Launch_Nav" };
     inline constexpr std::wstring_view interactionTag{ L"Interaction_Nav" };
+    inline constexpr std::wstring_view renderingTag{ L"Rendering_Nav" };
     inline constexpr std::wstring_view compatibilityTag{ L"Compatibility_Nav" };
     inline constexpr std::wstring_view actionsTag{ L"Actions_Nav" };
     inline constexpr std::wstring_view newTabMenuTag{ L"NewTabMenu_Nav" };
     inline constexpr std::wstring_view extensionsTag{ L"Extensions_Nav" };
-    inline constexpr std::wstring_view profilesTag{ L"Profiles_Nav" };
     inline constexpr std::wstring_view globalProfileTag{ L"GlobalProfile_Nav" };
     inline constexpr std::wstring_view addProfileTag{ L"AddProfile" };
     inline constexpr std::wstring_view colorSchemesTag{ L"ColorSchemes_Nav" };
@@ -28,11 +28,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         std::pair{ interactionTag, L"\xE7C9" }, /* Touch Pointer */
         std::pair{ globalAppearanceTag, L"\xE771" }, /* Personalize */
         std::pair{ colorSchemesTag, L"\xE790" }, /* Color */
+        std::pair{ renderingTag, L"\xE7F8" }, /* Device Laptop No Pic */
         std::pair{ compatibilityTag, L"\xEC7A" }, /* Developer Tools */
         std::pair{ actionsTag, L"\xE765" }, /* Keyboard Classic */
         std::pair{ newTabMenuTag, L"\xE71D" }, /* All Apps */
         std::pair{ extensionsTag, L"\xEA86" }, /* Puzzle */
-        std::pair{ profilesTag, L"\xE7EE" }, /* Other User */
         std::pair{ globalProfileTag, L"\xE81E" }, /* Map Layers */
         std::pair{ addProfileTag, L"\xE710" }, /* Add */
         std::pair{ openJsonTag, L"\xE713" }, /* Settings */

src/cascadia/TerminalSettingsEditor/NewTabMenu.xaml

@@ -121,7 +121,7 @@
                                 Style="{StaticResource NewTabMenuEntryControlsWrapper}">
                     <TextBlock x:Uid="NewTabMenuEntry_Separator"
                                VerticalAlignment="Center"
-                               Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                               FontStyle="Italic" />
                 </ContentControl>
             </DataTemplate>
 
@@ -201,7 +201,7 @@
                                 DataContext="{Binding Mode=OneWay}"
                                 Style="{StaticResource NewTabMenuEntryControlsWrapper}">
                     <TextBlock VerticalAlignment="Center"
-                               Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                               FontStyle="Italic"
                                Text="{x:Bind DisplayText, Mode=OneWay}" />
                 </ContentControl>
             </DataTemplate>
@@ -213,7 +213,7 @@
                                 Style="{StaticResource NewTabMenuEntryControlsWrapper}">
                     <TextBlock x:Uid="NewTabMenuEntry_RemainingProfiles"
                                VerticalAlignment="Center"
-                               Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                               FontStyle="Italic" />
                 </ContentControl>
             </DataTemplate>
 
@@ -227,27 +227,11 @@
         </ResourceDictionary>
     </Page.Resources>
 
-    <Grid x:Name="RootGrid"
-          MaxWidth="{StaticResource StandardControlMaxWidth}"
-          ColumnSpacing="16"
-          RowSpacing="12">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition x:Name="ControlsColumn"
-                              Width="*" />
-            <ColumnDefinition x:Name="PreviewColumn"
-                              Width="*" />
-        </Grid.ColumnDefinitions>
+    <Grid RowSpacing="12">
         <Grid.RowDefinitions>
-            <!--
-                In the wide/medium (2-column) states, both PreviewArea and ControlsArea span
-                both rows so the row sizing here doesn't matter.
-                In the narrow (stacked) state, PreviewArea moves to row 0 and ControlsArea
-                moves to row 1, and the rows are resized via the visual state setters.
-            -->
-            <RowDefinition x:Name="PreviewRow"
-                           Height="0" />
-            <RowDefinition x:Name="ControlsRow"
-                           Height="*" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
         <!--  Folder Picker Dialog: used to select a folder to move entries to  -->
@@ -283,390 +267,253 @@
             </muxc:TreeView>
         </ContentDialog>
 
-        <Grid x:Name="PreviewArea"
-              Grid.Row="0"
-              Grid.RowSpan="2"
-              Grid.Column="1"
-              Grid.ColumnSpan="1">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-
-            <!--
-                Invisible header placeholder so the preview's top edge aligns with the first
-                SettingContainer in the controls column
-            -->
-            <TextBlock x:Name="PreviewHeaderPlaceholder"
-                       Grid.Row="0"
-                       Margin="0,4,0,4"
-                       AutomationProperties.AccessibilityView="Raw"
-                       IsHitTestVisible="False"
-                       Opacity="0"
-                       Style="{StaticResource TextBlockSubHeaderStyle}"
-                       Text="Preview" />
-
-            <!--  Preview Border: contains the ListView and the multi-select footer.  -->
-            <Border Grid.Row="1"
-                    MinHeight="300"
-                    Margin="0,4,0,0"
-                    VerticalAlignment="Stretch"
+        <!--  New Tab Menu Content  -->
+        <StackPanel Grid.Row="0"
+                    MaxWidth="{StaticResource StandardControlMaxWidth}"
+                    Spacing="8">
+            <Border Height="300"
+                    MaxWidth="{StaticResource StandardControlMaxWidth}"
+                    Margin="0,12,0,0"
                     BorderBrush="{ThemeResource SystemControlForegroundBaseMediumLowBrush}"
                     BorderThickness="1"
                     CornerRadius="{ThemeResource ControlCornerRadius}">
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="*" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-
-                    <ListView x:Name="NewTabMenuListView"
-                              Grid.Row="0"
-                              AllowDrop="True"
-                              CanDragItems="True"
-                              CanReorderItems="True"
-                              ItemTemplateSelector="{StaticResource NewTabMenuEntryTemplateSelector}"
-                              ItemsSource="{x:Bind ViewModel.CurrentView, Mode=OneWay}"
-                              SelectionMode="Multiple" />
-
-                    <!--  Preview Controls  -->
-                    <Border Grid.Row="1"
-                            Padding="8"
-                            BorderBrush="{ThemeResource SystemControlForegroundBaseMediumLowBrush}"
-                            BorderThickness="0,1,0,0">
-                        <Grid ColumnSpacing="8">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <Button x:Name="MoveToFolderButton"
-                                    Grid.Column="0"
-                                    HorizontalAlignment="Stretch"
-                                    HorizontalContentAlignment="Stretch"
-                                    Click="MoveMultiple_Click"
-                                    IsEnabled="False">
-                                <Grid ColumnSpacing="8">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="*" />
-                                    </Grid.ColumnDefinitions>
-                                    <FontIcon Grid.Column="0"
-                                              VerticalAlignment="Center"
-                                              FontSize="{StaticResource StandardIconSize}"
-                                              Glyph="&#xE8DE;" />
-                                    <TextBlock x:Uid="NewTabMenu_MoveToFolderTextBlock"
-                                               Grid.Column="1"
-                                               VerticalAlignment="Center"
-                                               TextWrapping="WrapWholeWords" />
-                                </Grid>
-                            </Button>
-                            <Button x:Name="DeleteMultipleButton"
-                                    Grid.Column="1"
-                                    HorizontalAlignment="Stretch"
-                                    VerticalAlignment="Stretch"
-                                    HorizontalContentAlignment="Stretch"
-                                    Click="DeleteMultiple_Click"
-                                    IsEnabled="False"
-                                    Style="{StaticResource DeleteButtonStyle}">
-                                <Grid ColumnSpacing="8">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="*" />
-                                    </Grid.ColumnDefinitions>
-                                    <FontIcon Grid.Column="0"
-                                              VerticalAlignment="Center"
-                                              FontSize="{StaticResource StandardIconSize}"
-                                              Glyph="&#xE74D;" />
-                                    <TextBlock x:Uid="NewTabMenu_DeleteMultipleTextBlock"
-                                               Grid.Column="1"
-                                               VerticalAlignment="Center"
-                                               TextWrapping="WrapWholeWords" />
-                                </Grid>
-                            </Button>
-                        </Grid>
-                    </Border>
-                </Grid>
+                <ListView x:Name="NewTabMenuListView"
+                          AllowDrop="True"
+                          CanDragItems="True"
+                          CanReorderItems="True"
+                          ItemTemplateSelector="{StaticResource NewTabMenuEntryTemplateSelector}"
+                          ItemsSource="{x:Bind ViewModel.CurrentView, Mode=OneWay}"
+                          SelectionMode="Multiple" />
             </Border>
-        </Grid>
 
-        <ScrollViewer x:Name="ControlsArea"
-                      Grid.Row="0"
-                      Grid.RowSpan="2"
-                      Grid.Column="0"
-                      Grid.ColumnSpan="1"
-                      HorizontalScrollMode="Disabled"
-                      VerticalScrollBarVisibility="Auto">
-            <StackPanel>
-                <!--  Folder View Controls  -->
-                <StackPanel Margin="0,0,0,24"
-                            Visibility="{x:Bind ViewModel.IsFolderView, Mode=OneWay}">
-                    <TextBlock x:Uid="NewTabMenu_CurrentFolderTextBlock"
-                               Margin="0,4,0,4"
-                               Style="{StaticResource TextBlockSubHeaderStyle}" />
-                    <!--  Name  -->
-                    <local:SettingContainer x:Name="CurrentFolderName"
-                                            x:Uid="NewTabMenu_CurrentFolderName"
-                                            CurrentValue="{x:Bind ViewModel.CurrentFolderName, Mode=OneWay}"
-                                            Style="{StaticResource ExpanderSettingContainerStyle}">
-                        <TextBox Style="{StaticResource TextBoxSettingStyle}"
-                                 Text="{x:Bind ViewModel.CurrentFolderName, Mode=TwoWay}" />
-                    </local:SettingContainer>
-
-                    <!--  Icon  -->
-                    <local:SettingContainer x:Name="CurrentFolderIcon"
-                                            x:Uid="NewTabMenu_CurrentFolderIcon"
-                                            CurrentValueAccessibleName="{x:Bind ViewModel.CurrentFolderLocalizedIcon, Mode=OneWay}"
-                                            Style="{StaticResource ExpanderSettingContainerStyle}">
-                        <local:SettingContainer.CurrentValue>
-                            <Grid>
-                                <ContentControl Width="16"
-                                                Height="16"
-                                                Content="{x:Bind ViewModel.CurrentFolderIconPreview, Mode=OneWay}"
-                                                IsTabStop="False"
-                                                Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(ViewModel.CurrentFolderUsingNoIcon), Mode=OneWay}" />
-                                <TextBlock Margin="0,0,0,0"
-                                           HorizontalAlignment="Right"
-                                           VerticalAlignment="Center"
-                                           FontFamily="Segoe UI, Segoe Fluent Icons, Segoe MDL2 Assets"
-                                           Style="{StaticResource SettingsPageItemDescriptionStyle}"
-                                           Text="{x:Bind ViewModel.CurrentFolderLocalizedIcon, Mode=OneWay}"
-                                           Visibility="{x:Bind ViewModel.CurrentFolderUsingNoIcon, Mode=OneWay}" />
-                            </Grid>
-                        </local:SettingContainer.CurrentValue>
-                        <local:SettingContainer.Content>
-                            <local:IconPicker CurrentIconPath="{x:Bind ViewModel.CurrentFolderIconPath, Mode=TwoWay}"
-                                              WindowRoot="{x:Bind WindowRoot, Mode=OneWay}" />
-                        </local:SettingContainer.Content>
-                    </local:SettingContainer>
-
-                    <!--  Inlining  -->
-                    <local:SettingContainer x:Name="CurrentFolderInlining"
-                                            x:Uid="NewTabMenu_CurrentFolderInlining">
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.CurrentFolderInlining, Mode=TwoWay}"
-                                      Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                    </local:SettingContainer>
-
-                    <!--  Allow Empty  -->
-                    <local:SettingContainer x:Name="CurrentFolderAllowEmpty"
-                                            x:Uid="NewTabMenu_CurrentFolderAllowEmpty">
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.CurrentFolderAllowEmpty, Mode=TwoWay}"
-                                      Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                    </local:SettingContainer>
-                </StackPanel>
-
-                <!--  Add Entries  -->
-                <StackPanel>
-                    <TextBlock x:Uid="NewTabMenu_AddEntriesTextBlock"
-                               Margin="0,4,0,4"
-                               Style="{StaticResource TextBlockSubHeaderStyle}" />
-
-                    <!--  Add Profile  -->
-                    <local:SettingContainer x:Name="AddProfile"
-                                            x:Uid="NewTabMenu_AddProfile"
-                                            FontIconGlyph="&#xE756;"
-                                            Style="{StaticResource SettingContainerWithIcon}">
-
-                        <StackPanel Orientation="Horizontal"
-                                    Spacing="4">
-                            <!--  Select profile to add  -->
-                            <ComboBox x:Name="AddProfileComboBox"
-                                      MinWidth="{StaticResource StandardBoxMinWidth}"
-                                      ItemsSource="{x:Bind ViewModel.AvailableProfiles, Mode=OneWay}"
-                                      SelectedItem="{x:Bind ViewModel.SelectedProfile, Mode=TwoWay}">
-                                <ComboBox.ItemTemplate>
-                                    <DataTemplate x:DataType="model:Profile">
-                                        <Grid HorizontalAlignment="Stretch"
-                                              ColumnSpacing="8">
-
-                                            <Grid.ColumnDefinitions>
-                                                <!--  icon  -->
-                                                <ColumnDefinition Width="16" />
-                                                <!--  profile name  -->
-                                                <ColumnDefinition Width="Auto" />
-                                            </Grid.ColumnDefinitions>
-
-                                            <IconSourceElement Grid.Column="0"
-                                                               Width="16"
-                                                               Height="16"
-                                                               IconSource="{x:Bind mtu:IconPathConverter.IconSourceWUX(Icon.Resolved), Mode=OneTime}" />
-
-                                            <TextBlock Grid.Column="1"
-                                                       Text="{x:Bind Name}" />
-                                        </Grid>
-                                    </DataTemplate>
-                                </ComboBox.ItemTemplate>
-                            </ComboBox>
-
-                            <Button x:Name="AddProfileButton"
-                                    x:Uid="NewTabMenu_AddProfileButton"
-                                    HorizontalAlignment="Stretch"
-                                    VerticalAlignment="Stretch"
-                                    Click="AddProfileButton_Clicked">
-                                <Button.Content>
-                                    <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                              Glyph="&#xE710;" />
-                                </Button.Content>
-                            </Button>
-                        </StackPanel>
-                    </local:SettingContainer>
-
-                    <!--  Add Separator  -->
-                    <local:SettingContainer x:Name="AddSeparator"
-                                            x:Uid="NewTabMenu_AddSeparator"
-                                            FontIconGlyph="&#xE76f;"
-                                            Style="{StaticResource SettingContainerWithIcon}">
-                        <Button x:Name="AddSeparatorButton"
-                                x:Uid="NewTabMenu_AddSeparatorButton"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                Click="AddSeparatorButton_Clicked">
-                            <Button.Content>
-                                <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                          Glyph="&#xE710;" />
-                            </Button.Content>
-                        </Button>
-                    </local:SettingContainer>
-
-                    <!--  Add Folder  -->
-                    <local:SettingContainer x:Name="AddFolder"
-                                            x:Uid="NewTabMenu_AddFolder"
-                                            FontIconGlyph="&#xF12B;"
-                                            Style="{StaticResource SettingContainerWithIcon}">
-                        <StackPanel Orientation="Horizontal"
-                                    Spacing="5">
-                            <TextBox x:Name="FolderNameTextBox"
-                                     x:Uid="NewTabMenu_AddFolder_FolderName"
-                                     MinWidth="{StaticResource StandardBoxMinWidth}"
-                                     KeyDown="AddFolderNameTextBox_KeyDown"
-                                     Text="{x:Bind ViewModel.AddFolderName, Mode=TwoWay}"
-                                     TextChanged="AddFolderNameTextBox_TextChanged" />
-                            <Button x:Name="AddFolderButton"
-                                    x:Uid="NewTabMenu_AddFolderButton"
-                                    HorizontalAlignment="Stretch"
-                                    VerticalAlignment="Stretch"
-                                    Click="AddFolderButton_Clicked"
-                                    IsEnabled="False">
-                                <Button.Content>
-                                    <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                              Glyph="&#xE710;" />
-                                </Button.Content>
-                            </Button>
-                        </StackPanel>
-                    </local:SettingContainer>
-
-                    <!--  Add Match Profiles  -->
-                    <local:SettingContainer x:Name="AddMatchProfiles"
-                                            x:Uid="NewTabMenu_AddMatchProfiles"
-                                            FontIconGlyph="&#xE748;"
-                                            Style="{StaticResource ExpanderSettingContainerStyle}">
-                        <StackPanel Spacing="8">
-                            <HyperlinkButton x:Uid="NewTabMenu_AddMatchProfiles_Help"
-                                             NavigateUri="https://learn.microsoft.com/en-us/dotnet/standard/base-types/regular-expression-language-quick-reference" />
-                            <TextBox x:Uid="NewTabMenu_AddMatchProfiles_Name"
-                                     Text="{x:Bind ViewModel.ProfileMatcherName, Mode=TwoWay}" />
-                            <TextBox x:Uid="NewTabMenu_AddMatchProfiles_Source"
-                                     Text="{x:Bind ViewModel.ProfileMatcherSource, Mode=TwoWay}" />
-                            <TextBox x:Uid="NewTabMenu_AddMatchProfiles_Commandline"
-                                     Text="{x:Bind ViewModel.ProfileMatcherCommandline, Mode=TwoWay}" />
-                            <Button x:Name="AddMatchProfilesButton"
-                                    Click="AddMatchProfilesButton_Clicked">
-                                <Button.Content>
-                                    <StackPanel Orientation="Horizontal">
-                                        <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                                  Glyph="&#xE710;" />
-                                        <TextBlock x:Uid="NewTabMenu_AddMatchProfilesTextBlock"
-                                                   Style="{StaticResource IconButtonTextBlockStyle}" />
-                                    </StackPanel>
-                                </Button.Content>
-                            </Button>
-                        </StackPanel>
-                    </local:SettingContainer>
-
-                    <!--  Add Remaining Profiles  -->
-                    <local:SettingContainer x:Name="AddRemainingProfiles"
-                                            x:Uid="NewTabMenu_AddRemainingProfiles"
-                                            FontIconGlyph="&#xE902;"
-                                            Style="{StaticResource SettingContainerWithIcon}">
-                        <Button x:Name="AddRemainingProfilesButton"
-                                x:Uid="NewTabMenu_AddRemainingProfilesButton"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                Click="AddRemainingProfilesButton_Clicked"
-                                IsEnabled="{x:Bind ViewModel.IsRemainingProfilesEntryMissing, Mode=OneWay}">
-                            <Button.Content>
-                                <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                          Glyph="&#xE710;" />
-                            </Button.Content>
-                        </Button>
-                    </local:SettingContainer>
-                </StackPanel>
+            <!--  General Controls  -->
+            <StackPanel Orientation="Horizontal"
+                        Spacing="10">
+                <Button x:Name="MoveToFolderButton"
+                        Click="MoveMultiple_Click"
+                        IsEnabled="False">
+                    <StackPanel Orientation="Horizontal">
+                        <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                  Glyph="&#xE8DE;" />
+                        <TextBlock x:Uid="NewTabMenu_MoveToFolderTextBlock"
+                                   Margin="8,0,0,0" />
+                    </StackPanel>
+                </Button>
+                <Button x:Name="DeleteMultipleButton"
+                        Click="DeleteMultiple_Click"
+                        IsEnabled="False"
+                        Style="{StaticResource DeleteButtonStyle}">
+                    <StackPanel Orientation="Horizontal">
+                        <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                  Glyph="&#xE74D;" />
+                        <TextBlock x:Uid="NewTabMenu_DeleteMultipleTextBlock"
+                                   Margin="8,0,0,0" />
+                    </StackPanel>
+                </Button>
             </StackPanel>
-        </ScrollViewer>
+        </StackPanel>
 
-        <VisualStateManager.VisualStateGroups>
-            <VisualStateGroup>
-                <!--  Wide: 2 columns, controls on left with leading icons, preview on right.  -->
-                <VisualState x:Name="Wide">
-                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="1200" />
-                    </VisualState.StateTriggers>
-                    <VisualState.Setters>
-                        <Setter Target="AddProfile.Style" Value="{StaticResource SettingContainerWithIcon}" />
-                        <Setter Target="AddSeparator.Style" Value="{StaticResource SettingContainerWithIcon}" />
-                        <Setter Target="AddFolder.Style" Value="{StaticResource SettingContainerWithIcon}" />
-                        <Setter Target="AddMatchProfiles.Style" Value="{StaticResource ExpanderSettingContainerStyle}" />
-                        <Setter Target="AddRemainingProfiles.Style" Value="{StaticResource SettingContainerWithIcon}" />
-                    </VisualState.Setters>
-                </VisualState>
+        <!--  Folder View Controls  -->
+        <StackPanel Grid.Row="1"
+                    MaxWidth="{StaticResource StandardControlMaxWidth}"
+                    Visibility="{x:Bind ViewModel.IsFolderView, Mode=OneWay}">
+            <TextBlock x:Uid="NewTabMenu_CurrentFolderTextBlock"
+                       Style="{StaticResource TextBlockSubHeaderStyle}" />
+            <!--  Name  -->
+            <local:SettingContainer x:Name="CurrentFolderName"
+                                    x:Uid="NewTabMenu_CurrentFolderName"
+                                    CurrentValue="{x:Bind ViewModel.CurrentFolderName, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <TextBox Style="{StaticResource TextBoxSettingStyle}"
+                         Text="{x:Bind ViewModel.CurrentFolderName, Mode=TwoWay}" />
+            </local:SettingContainer>
 
-                <!--  Medium: 2 columns, controls on left WITHOUT leading icons, preview on right.  -->
-                <VisualState x:Name="Medium">
-                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="900" />
-                    </VisualState.StateTriggers>
-                    <VisualState.Setters>
-                        <Setter Target="AddProfile.Style" Value="{StaticResource DefaultSettingContainer}" />
-                        <Setter Target="AddSeparator.Style" Value="{StaticResource DefaultSettingContainer}" />
-                        <Setter Target="AddFolder.Style" Value="{StaticResource DefaultSettingContainer}" />
-                        <Setter Target="AddMatchProfiles.Style" Value="{StaticResource ExpanderSettingContainerStyle}" />
-                        <Setter Target="AddRemainingProfiles.Style" Value="{StaticResource DefaultSettingContainer}" />
-                    </VisualState.Setters>
-                </VisualState>
+            <!--  Icon  -->
+            <local:SettingContainer x:Name="CurrentFolderIcon"
+                                    x:Uid="NewTabMenu_CurrentFolderIcon"
+                                    CurrentValueAccessibleName="{x:Bind ViewModel.CurrentFolderLocalizedIcon, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
+                <local:SettingContainer.CurrentValue>
+                    <Grid>
+                        <ContentControl Width="16"
+                                        Height="16"
+                                        Content="{x:Bind ViewModel.CurrentFolderIconPreview, Mode=OneWay}"
+                                        IsTabStop="False"
+                                        Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(ViewModel.CurrentFolderUsingNoIcon), Mode=OneWay}" />
+                        <TextBlock Margin="0,0,0,0"
+                                   HorizontalAlignment="Right"
+                                   VerticalAlignment="Center"
+                                   FontFamily="Segoe UI, Segoe Fluent Icons, Segoe MDL2 Assets"
+                                   Style="{StaticResource SettingsPageItemDescriptionStyle}"
+                                   Text="{x:Bind ViewModel.CurrentFolderLocalizedIcon, Mode=OneWay}"
+                                   Visibility="{x:Bind ViewModel.CurrentFolderUsingNoIcon, Mode=OneWay}" />
+                    </Grid>
+                </local:SettingContainer.CurrentValue>
+                <local:SettingContainer.Content>
+                    <local:IconPicker CurrentIconPath="{x:Bind ViewModel.CurrentFolderIconPath, Mode=TwoWay}"
+                                      WindowRoot="{x:Bind WindowRoot, Mode=OneWay}" />
+                </local:SettingContainer.Content>
+            </local:SettingContainer>
 
-                <!--  Narrow: single column, preview stacked on top, controls below, no icons.  -->
-                <VisualState x:Name="Narrow">
-                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="0" />
-                    </VisualState.StateTriggers>
-                    <VisualState.Setters>
-                        <!--  Collapse the preview column and give the preview row real height so the rows are used instead of the columns.  -->
-                        <Setter Target="PreviewColumn.Width" Value="0" />
-                        <Setter Target="PreviewRow.Height" Value="Auto" />
+            <!--  Inlining  -->
+            <local:SettingContainer x:Name="CurrentFolderInlining"
+                                    x:Uid="NewTabMenu_CurrentFolderInlining">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.CurrentFolderInlining, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                        <!--  Move PreviewArea to row 0, spanning both columns.  -->
-                        <Setter Target="PreviewArea.(Grid.Row)" Value="0" />
-                        <Setter Target="PreviewArea.(Grid.RowSpan)" Value="1" />
-                        <Setter Target="PreviewArea.(Grid.Column)" Value="0" />
-                        <Setter Target="PreviewArea.(Grid.ColumnSpan)" Value="2" />
+            <!--  Allow Empty  -->
+            <local:SettingContainer x:Name="CurrentFolderAllowEmpty"
+                                    x:Uid="NewTabMenu_CurrentFolderAllowEmpty">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.CurrentFolderAllowEmpty, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
+        </StackPanel>
 
-                        <!--  Move ControlsArea to row 1, spanning both columns.  -->
-                        <Setter Target="ControlsArea.(Grid.Row)" Value="1" />
-                        <Setter Target="ControlsArea.(Grid.RowSpan)" Value="1" />
-                        <Setter Target="ControlsArea.(Grid.Column)" Value="0" />
-                        <Setter Target="ControlsArea.(Grid.ColumnSpan)" Value="2" />
+        <!--  Add Entries  -->
+        <StackPanel Grid.Row="2">
+            <TextBlock x:Uid="NewTabMenu_AddEntriesTextBlock"
+                       Style="{StaticResource TextBlockSubHeaderStyle}" />
 
-                        <!--  No icons in the narrow state either (progressive simplification).  -->
-                        <Setter Target="AddProfile.Style" Value="{StaticResource DefaultSettingContainer}" />
-                        <Setter Target="AddSeparator.Style" Value="{StaticResource DefaultSettingContainer}" />
-                        <Setter Target="AddFolder.Style" Value="{StaticResource DefaultSettingContainer}" />
-                        <Setter Target="AddMatchProfiles.Style" Value="{StaticResource ExpanderSettingContainerStyle}" />
-                        <Setter Target="AddRemainingProfiles.Style" Value="{StaticResource DefaultSettingContainer}" />
+            <!--  Add Profile  -->
+            <local:SettingContainer x:Name="AddProfile"
+                                    x:Uid="NewTabMenu_AddProfile"
+                                    FontIconGlyph="&#xE756;"
+                                    Style="{StaticResource SettingContainerWithIcon}">
 
-                        <!--  Hide the preview header placeholder in stacked mode (no controls beside the preview to align with).  -->
-                        <Setter Target="PreviewHeaderPlaceholder.Visibility" Value="Collapsed" />
-                    </VisualState.Setters>
-                </VisualState>
-            </VisualStateGroup>
-        </VisualStateManager.VisualStateGroups>
+                <StackPanel Orientation="Horizontal"
+                            Spacing="4">
+                    <!--  Select profile to add  -->
+                    <ComboBox x:Name="AddProfileComboBox"
+                              MinWidth="{StaticResource StandardBoxMinWidth}"
+                              ItemsSource="{x:Bind ViewModel.AvailableProfiles, Mode=OneWay}"
+                              SelectedItem="{x:Bind ViewModel.SelectedProfile, Mode=TwoWay}">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate x:DataType="model:Profile">
+                                <Grid HorizontalAlignment="Stretch"
+                                      ColumnSpacing="8">
+
+                                    <Grid.ColumnDefinitions>
+                                        <!--  icon  -->
+                                        <ColumnDefinition Width="16" />
+                                        <!--  profile name  -->
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
+
+                                    <IconSourceElement Grid.Column="0"
+                                                       Width="16"
+                                                       Height="16"
+                                                       IconSource="{x:Bind mtu:IconPathConverter.IconSourceWUX(Icon.Resolved), Mode=OneTime}" />
+
+                                    <TextBlock Grid.Column="1"
+                                               Text="{x:Bind Name}" />
+                                </Grid>
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
+
+                    <Button x:Name="AddProfileButton"
+                            x:Uid="NewTabMenu_AddProfileButton"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            Click="AddProfileButton_Clicked">
+                        <Button.Content>
+                            <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                      Glyph="&#xE710;" />
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+            </local:SettingContainer>
+
+            <!--  Add Separator  -->
+            <local:SettingContainer x:Name="AddSeparator"
+                                    x:Uid="NewTabMenu_AddSeparator"
+                                    FontIconGlyph="&#xE76f;"
+                                    Style="{StaticResource SettingContainerWithIcon}">
+                <Button x:Name="AddSeparatorButton"
+                        x:Uid="NewTabMenu_AddSeparatorButton"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        Click="AddSeparatorButton_Clicked">
+                    <Button.Content>
+                        <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                  Glyph="&#xE710;" />
+                    </Button.Content>
+                </Button>
+            </local:SettingContainer>
+
+            <!--  Add Folder  -->
+            <local:SettingContainer x:Name="AddFolder"
+                                    x:Uid="NewTabMenu_AddFolder"
+                                    FontIconGlyph="&#xF12B;"
+                                    Style="{StaticResource SettingContainerWithIcon}">
+                <StackPanel Orientation="Horizontal"
+                            Spacing="5">
+                    <TextBox x:Name="FolderNameTextBox"
+                             x:Uid="NewTabMenu_AddFolder_FolderName"
+                             MinWidth="{StaticResource StandardBoxMinWidth}"
+                             KeyDown="AddFolderNameTextBox_KeyDown"
+                             Text="{x:Bind ViewModel.AddFolderName, Mode=TwoWay}"
+                             TextChanged="AddFolderNameTextBox_TextChanged" />
+                    <Button x:Name="AddFolderButton"
+                            x:Uid="NewTabMenu_AddFolderButton"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            Click="AddFolderButton_Clicked"
+                            IsEnabled="False">
+                        <Button.Content>
+                            <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                      Glyph="&#xE710;" />
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+            </local:SettingContainer>
+
+            <!--  Add Match Profiles  -->
+            <local:SettingContainer x:Name="AddMatchProfiles"
+                                    x:Uid="NewTabMenu_AddMatchProfiles"
+                                    FontIconGlyph="&#xE748;"
+                                    Style="{StaticResource ExpanderSettingContainerStyleWithIcon}">
+                <StackPanel Spacing="8">
+                    <HyperlinkButton x:Uid="NewTabMenu_AddMatchProfiles_Help"
+                                     NavigateUri="https://learn.microsoft.com/en-us/dotnet/standard/base-types/regular-expression-language-quick-reference" />
+                    <TextBox x:Uid="NewTabMenu_AddMatchProfiles_Name"
+                             Text="{x:Bind ViewModel.ProfileMatcherName, Mode=TwoWay}" />
+                    <TextBox x:Uid="NewTabMenu_AddMatchProfiles_Source"
+                             Text="{x:Bind ViewModel.ProfileMatcherSource, Mode=TwoWay}" />
+                    <TextBox x:Uid="NewTabMenu_AddMatchProfiles_Commandline"
+                             Text="{x:Bind ViewModel.ProfileMatcherCommandline, Mode=TwoWay}" />
+                    <Button x:Name="AddMatchProfilesButton"
+                            Click="AddMatchProfilesButton_Clicked">
+                        <Button.Content>
+                            <StackPanel Orientation="Horizontal">
+                                <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                          Glyph="&#xE710;" />
+                                <TextBlock x:Uid="NewTabMenu_AddMatchProfilesTextBlock"
+                                           Style="{StaticResource IconButtonTextBlockStyle}" />
+                            </StackPanel>
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+            </local:SettingContainer>
+
+            <!--  Add Remaining Profiles  -->
+            <local:SettingContainer x:Name="AddRemainingProfiles"
+                                    x:Uid="NewTabMenu_AddRemainingProfiles"
+                                    FontIconGlyph="&#xE902;"
+                                    Style="{StaticResource SettingContainerWithIcon}">
+                <Button x:Name="AddRemainingProfilesButton"
+                        x:Uid="NewTabMenu_AddRemainingProfilesButton"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        Click="AddRemainingProfilesButton_Clicked"
+                        IsEnabled="{x:Bind ViewModel.IsRemainingProfilesEntryMissing, Mode=OneWay}">
+                    <Button.Content>
+                        <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                  Glyph="&#xE710;" />
+                    </Button.Content>
+                </Button>
+            </local:SettingContainer>
+        </StackPanel>
     </Grid>
 </Page>

src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp

@@ -127,14 +127,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             {
                 _NotifyChanges(L"TabColorPreview");
             }
-            else if (viewModelProperty == L"Hidden")
-            {
-                _NotifyChanges(L"AccessibleStateDescription");
-            }
-            else if (viewModelProperty == L"Name" || viewModelProperty == L"IsBaseLayer")
-            {
-                _NotifyChanges(L"SectionHeaderText");
-            }
         });
 
         _defaultAppearanceViewModel.PropertyChanged([this](auto&&, const PropertyChangedEventArgs& args) {
@@ -356,27 +348,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return _profile.Orphaned();
     }
 
-    hstring ProfileViewModel::AccessibleStateDescription() const
-    {
-        const auto hidden = Hidden();
-        const auto orphaned = Orphaned();
-        if (hidden && orphaned)
-        {
-            return til::hstring_format(FMT_COMPILE(L"{}, {}"),
-                                       RS_(L"Profile_HiddenBadge/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip"),
-                                       RS_(L"Profile_OrphanedBadge/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip"));
-        }
-        if (hidden)
-        {
-            return RS_(L"Profile_HiddenBadge/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip");
-        }
-        if (orphaned)
-        {
-            return RS_(L"Profile_OrphanedBadge/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip");
-        }
-        return {};
-    }
-
     hstring ProfileViewModel::TabTitlePreview() const
     {
         if (const auto tabTitle{ TabTitle() }; !tabTitle.empty())
@@ -386,15 +357,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return RS_(L"Profile_TabTitleNone");
     }
 
-    hstring ProfileViewModel::SectionHeaderText() const
-    {
-        if (IsBaseLayer())
-        {
-            return RS_(L"Profile_DefaultsSectionHeader");
-        }
-        return hstring{ RS_fmt(L"Profile_NameSectionHeaderFormat", Name()) };
-    }
-
     hstring ProfileViewModel::AnswerbackMessagePreview() const
     {
         if (const auto answerbackMessage{ AnswerbackMessage() }; !answerbackMessage.empty())
@@ -612,7 +574,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     hstring ProfileViewModel::BellStylePreview() const
     {
         const auto bellStyle = BellStyle();
-        if (WI_AreAllFlagsSet(bellStyle, BellStyle::Audible | BellStyle::Window | BellStyle::Taskbar | BellStyle::Notification))
+        if (WI_AreAllFlagsSet(bellStyle, BellStyle::Audible | BellStyle::Window | BellStyle::Taskbar))
         {
             return RS_(L"Profile_BellStyleAll/Content");
         }
@@ -622,7 +584,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }
 
         std::vector<hstring> resultList;
-        resultList.reserve(4);
+        resultList.reserve(3);
         if (WI_IsFlagSet(bellStyle, BellStyle::Audible))
         {
             resultList.emplace_back(RS_(L"Profile_BellStyleAudible/Content"));
@@ -635,10 +597,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         {
             resultList.emplace_back(RS_(L"Profile_BellStyleTaskbar/Content"));
         }
-        if (WI_IsFlagSet(bellStyle, BellStyle::Notification))
-        {
-            resultList.emplace_back(RS_(L"Profile_BellStyleNotification/Content"));
-        }
 
         // add in the commas
         hstring result{};
@@ -682,13 +640,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         BellStyle(currentStyle);
     }
 
-    void ProfileViewModel::SetBellStyleNotification(winrt::Windows::Foundation::IReference<bool> on)
-    {
-        auto currentStyle = BellStyle();
-        WI_UpdateFlag(currentStyle, Model::BellStyle::Notification, winrt::unbox_value<bool>(on));
-        BellStyle(currentStyle);
-    }
-
     // Method Description:
     // - Construct _CurrentBellSounds by importing the _inherited_ value from the model
     // - Adds a PropertyChanged handler to each BellSoundViewModel to propagate changes to the model

src/cascadia/TerminalSettingsEditor/ProfileViewModel.h

@@ -46,7 +46,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void SetBellStyleAudible(winrt::Windows::Foundation::IReference<bool> on);
         void SetBellStyleWindow(winrt::Windows::Foundation::IReference<bool> on);
         void SetBellStyleTaskbar(winrt::Windows::Foundation::IReference<bool> on);
-        void SetBellStyleNotification(winrt::Windows::Foundation::IReference<bool> on);
 
         hstring BellSoundPreview();
         void RequestAddBellSound(hstring path);
@@ -100,9 +99,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         bool AutoMarkPromptsAvailable() const noexcept;
         bool RepositionCursorWithMouseAvailable() const noexcept;
 
-        hstring SectionHeaderText() const;
         bool Orphaned() const;
-        hstring AccessibleStateDescription() const;
         hstring TabTitlePreview() const;
         hstring AnswerbackMessagePreview() const;
         Windows::UI::Color TabColorPreview() const;

src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl

@@ -49,7 +49,6 @@ namespace Microsoft.Terminal.Settings.Editor
         void SetBellStyleAudible(Windows.Foundation.IReference<Boolean> on);
         void SetBellStyleWindow(Windows.Foundation.IReference<Boolean> on);
         void SetBellStyleTaskbar(Windows.Foundation.IReference<Boolean> on);
-        void SetBellStyleNotification(Windows.Foundation.IReference<Boolean> on);
 
         String BellSoundPreview { get; };
         Windows.Foundation.Collections.IObservableVector<BellSoundViewModel> CurrentBellSounds { get; };
@@ -105,9 +104,7 @@ namespace Microsoft.Terminal.Settings.Editor
         void CreateUnfocusedAppearance();
         void DeleteUnfocusedAppearance();
 
-        String SectionHeaderText { get; };
         Boolean Orphaned { get; };
-        String AccessibleStateDescription { get; };
         OBSERVABLE_PROJECTED_PROFILE_SETTING(String, Name);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(Guid, Guid);
         OBSERVABLE_PROJECTED_PROFILE_SETTING(String, Source);

src/cascadia/TerminalSettingsEditor/Profiles.cpp

@@ -1,96 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "Profiles.h"
-#include "Profiles.g.cpp"
-#include "ProfilesPageViewModel.g.cpp"
-#include "ProfileViewModel.h"
-
-using namespace winrt::Windows::Foundation;
-using namespace winrt::Windows::Foundation::Collections;
-using namespace winrt::Windows::UI::Xaml;
-using namespace winrt::Windows::UI::Xaml::Controls;
-using namespace winrt::Windows::UI::Xaml::Navigation;
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    Profiles::Profiles()
-    {
-        InitializeComponent();
-
-        Automation::AutomationProperties::SetName(DefaultsNavigator(), RS_(L"Profiles_DefaultsNavigator_Title/Text"));
-        Automation::AutomationProperties::SetHelpText(DefaultsNavigator(), RS_(L"Profiles_DefaultsNavigator_Description/Text"));
-        Automation::AutomationProperties::SetName(ColorSchemesNavigator(), RS_(L"Profiles_ColorSchemesNavigator_Title/Text"));
-        Automation::AutomationProperties::SetHelpText(ColorSchemesNavigator(), RS_(L"Profiles_ColorSchemesNavigator_Description/Text"));
-        Automation::AutomationProperties::SetName(AddProfileButton(), RS_(L"Profiles_AddProfileButton/Text"));
-    }
-
-    void Profiles::OnNavigatedTo(const NavigationEventArgs& e)
-    {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::ProfilesPageViewModel>();
-        BringIntoViewWhenLoaded(args.ElementToFocus());
-
-        TraceLoggingWrite(
-            g_hTerminalSettingsEditorProvider,
-            "NavigatedToPage",
-            TraceLoggingDescription("Event emitted when the user navigates to a page in the settings UI"),
-            TraceLoggingValue("profilesLanding", "PageId", "The identifier of the page that was navigated to"),
-            TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
-            TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
-    }
-
-    void Profiles::Defaults_Click(const IInspectable& /*sender*/, const RoutedEventArgs& /*args*/)
-    {
-        _ViewModel.RequestOpenDefaults();
-    }
-
-    void Profiles::ColorSchemes_Click(const IInspectable& /*sender*/, const RoutedEventArgs& /*args*/)
-    {
-        _ViewModel.RequestOpenColorSchemes();
-    }
-
-    void Profiles::AddProfile_Click(const IInspectable& /*sender*/, const RoutedEventArgs& /*args*/)
-    {
-        _ViewModel.RequestAddProfile();
-    }
-
-    void Profiles::Profile_Click(const IInspectable& sender, const RoutedEventArgs& /*args*/)
-    {
-        // Profile navigators are buttons whose DataContext is the bound ProfileViewModel.
-        if (const auto element = sender.try_as<FrameworkElement>())
-        {
-            if (const auto profile = element.DataContext().try_as<Editor::ProfileViewModel>())
-            {
-                _ViewModel.RequestOpenProfile(profile);
-            }
-        }
-    }
-
-    ProfilesPageViewModel::ProfilesPageViewModel()
-    {
-        _setProfiles(single_threaded_observable_vector<Editor::ProfileViewModel>());
-    }
-
-    void ProfilesPageViewModel::RequestOpenDefaults()
-    {
-        OpenDefaultsRequested.raise(*this, nullptr);
-    }
-
-    void ProfilesPageViewModel::RequestOpenColorSchemes()
-    {
-        OpenColorSchemesRequested.raise(*this, nullptr);
-    }
-
-    void ProfilesPageViewModel::RequestAddProfile()
-    {
-        AddProfileRequested.raise(*this, nullptr);
-    }
-
-    void ProfilesPageViewModel::RequestOpenProfile(const Editor::ProfileViewModel& profile)
-    {
-        OpenProfileRequested.raise(*this, profile);
-    }
-
-}

src/cascadia/TerminalSettingsEditor/Profiles.h

@@ -1,67 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
-
-Module Name:
-- Profiles.h
-
-Abstract:
-- The Profiles landing page in the Settings UI. The page hosts entry points to
-  the list of individual profiles among other profile-related settings.
-
---*/
-
-#pragma once
-
-#include "Profiles.g.h"
-#include "ProfilesPageViewModel.g.h"
-#include "ProfileViewModel.h"
-#include "Utils.h"
-#include "ViewModelHelpers.h"
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    struct ProfilesPageViewModel : ProfilesPageViewModelT<ProfilesPageViewModel>, ViewModelHelper<ProfilesPageViewModel>
-    {
-    public:
-        ProfilesPageViewModel();
-
-        void RequestOpenDefaults();
-        void RequestOpenColorSchemes();
-        void RequestAddProfile();
-        void RequestOpenProfile(const Editor::ProfileViewModel& profile);
-
-        // DON'T YOU DARE ADD A `WINRT_CALLBACK(PropertyChanged` TO A CLASS DERIVED FROM ViewModelHelper. Do this instead:
-        using ViewModelHelper<ProfilesPageViewModel>::PropertyChanged;
-
-        WINRT_OBSERVABLE_PROPERTY(Windows::Foundation::Collections::IObservableVector<Editor::ProfileViewModel>, Profiles, _propertyChangedHandlers, nullptr);
-
-    public:
-        til::typed_event<Windows::Foundation::IInspectable, Windows::Foundation::IInspectable> OpenDefaultsRequested;
-        til::typed_event<Windows::Foundation::IInspectable, Windows::Foundation::IInspectable> OpenColorSchemesRequested;
-        til::typed_event<Windows::Foundation::IInspectable, Windows::Foundation::IInspectable> AddProfileRequested;
-        til::typed_event<Windows::Foundation::IInspectable, Editor::ProfileViewModel> OpenProfileRequested;
-    };
-
-    struct Profiles : public HasScrollViewer<Profiles>, ProfilesT<Profiles>
-    {
-    public:
-        Profiles();
-
-        void OnNavigatedTo(const winrt::Windows::UI::Xaml::Navigation::NavigationEventArgs& e);
-
-        void Defaults_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& args);
-        void ColorSchemes_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& args);
-        void AddProfile_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& args);
-        void Profile_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& args);
-
-        til::property_changed_event PropertyChanged;
-        WINRT_PROPERTY(Editor::ProfilesPageViewModel, ViewModel, nullptr);
-    };
-}
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
-{
-    BASIC_FACTORY(Profiles);
-    BASIC_FACTORY(ProfilesPageViewModel);
-}

src/cascadia/TerminalSettingsEditor/Profiles.idl

@@ -1,31 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-import "ProfileViewModel.idl";
-import "ColorSchemeViewModel.idl";
-
-namespace Microsoft.Terminal.Settings.Editor
-{
-    runtimeclass ProfilesPageViewModel : Windows.UI.Xaml.Data.INotifyPropertyChanged
-    {
-        ProfilesPageViewModel();
-
-        Windows.Foundation.Collections.IObservableVector<ProfileViewModel> Profiles { get; };
-
-        void RequestOpenDefaults();
-        void RequestOpenColorSchemes();
-        void RequestAddProfile();
-        void RequestOpenProfile(ProfileViewModel profile);
-
-        event Windows.Foundation.TypedEventHandler<Object, IInspectable> OpenDefaultsRequested;
-        event Windows.Foundation.TypedEventHandler<Object, IInspectable> OpenColorSchemesRequested;
-        event Windows.Foundation.TypedEventHandler<Object, IInspectable> AddProfileRequested;
-        event Windows.Foundation.TypedEventHandler<Object, ProfileViewModel> OpenProfileRequested;
-    }
-
-    [default_interface] runtimeclass Profiles : Windows.UI.Xaml.Controls.Page
-    {
-        Profiles();
-        ProfilesPageViewModel ViewModel { get; };
-    }
-}

src/cascadia/TerminalSettingsEditor/Profiles.xaml

@@ -1,139 +0,0 @@
-<!--
-    Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
-    the MIT License. See LICENSE in the project root for license information.
--->
-<Page x:Class="Microsoft.Terminal.Settings.Editor.Profiles"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:local="using:Microsoft.Terminal.Settings.Editor"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:model="using:Microsoft.Terminal.Settings.Model"
-      xmlns:mtu="using:Microsoft.Terminal.UI"
-      xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-      mc:Ignorable="d">
-
-    <Page.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="CommonResources.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-
-            <DataTemplate x:Key="ProfileNavigatorTemplate"
-                          x:DataType="local:ProfileViewModel">
-                <Button HorizontalAlignment="Stretch"
-                        AutomationProperties.HelpText="{x:Bind AccessibleStateDescription, Mode=OneWay}"
-                        AutomationProperties.Name="{x:Bind Name, Mode=OneWay}"
-                        Click="Profile_Click"
-                        Style="{StaticResource NavigatorButtonStyle}">
-                    <Grid ColumnSpacing="12">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="16" />
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <ContentControl Grid.Column="0"
-                                        Width="16"
-                                        Height="16"
-                                        VerticalAlignment="Center"
-                                        Content="{x:Bind IconPreview, Mode=OneWay}"
-                                        IsTabStop="False" />
-                        <TextBlock Grid.Column="1"
-                                   VerticalAlignment="Center"
-                                   Text="{x:Bind Name, Mode=OneWay}"
-                                   TextTrimming="CharacterEllipsis" />
-                        <muxc:InfoBadge x:Uid="Profile_HiddenBadge"
-                                        Grid.Column="2"
-                                        Margin="0,0,8,0"
-                                        VerticalAlignment="Center"
-                                        Visibility="{x:Bind Hidden, Mode=OneWay}">
-                            <muxc:InfoBadge.IconSource>
-                                <muxc:FontIconSource FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
-                                                     FontSize="12"
-                                                     Glyph="&#xED1A;" />
-                            </muxc:InfoBadge.IconSource>
-                        </muxc:InfoBadge>
-                        <muxc:InfoBadge x:Uid="Profile_OrphanedBadge"
-                                        Grid.Column="2"
-                                        Margin="0,0,8,0"
-                                        VerticalAlignment="Center"
-                                        Visibility="{x:Bind Orphaned, Mode=OneWay}">
-                            <muxc:InfoBadge.IconSource>
-                                <muxc:FontIconSource FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
-                                                     FontSize="12"
-                                                     Glyph="&#xE7BA;" />
-                            </muxc:InfoBadge.IconSource>
-                        </muxc:InfoBadge>
-                    </Grid>
-                </Button>
-            </DataTemplate>
-        </ResourceDictionary>
-    </Page.Resources>
-
-    <StackPanel Style="{StaticResource SettingsStackStyle}"
-                XYFocusKeyboardNavigation="Enabled">
-
-        <!--  General Profile Settings  -->
-        <TextBlock x:Uid="Profiles_GeneralSettingsHeader"
-                   Margin="0,0,0,4"
-                   Style="{StaticResource TextBlockSubHeaderStyle}" />
-
-        <!--  Defaults navigator  -->
-        <Button x:Name="DefaultsNavigator"
-                Click="Defaults_Click"
-                Style="{StaticResource NavigatorButtonStyle}">
-            <StackPanel Orientation="Vertical">
-                <TextBlock x:Uid="Profiles_DefaultsNavigator_Title" />
-                <TextBlock x:Uid="Profiles_DefaultsNavigator_Description"
-                           Margin="0,2,0,0"
-                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                           Style="{StaticResource CaptionTextBlockStyle}"
-                           TextWrapping="Wrap" />
-            </StackPanel>
-        </Button>
-
-        <!--  Color schemes navigator  -->
-        <Button x:Name="ColorSchemesNavigator"
-                Click="ColorSchemes_Click"
-                Style="{StaticResource NavigatorButtonStyle}">
-            <StackPanel Orientation="Vertical">
-                <TextBlock x:Uid="Profiles_ColorSchemesNavigator_Title" />
-                <TextBlock x:Uid="Profiles_ColorSchemesNavigator_Description"
-                           Margin="0,2,0,0"
-                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                           Style="{StaticResource CaptionTextBlockStyle}"
-                           TextWrapping="Wrap" />
-            </StackPanel>
-        </Button>
-
-        <!--  Terminal profiles section  -->
-        <TextBlock x:Uid="Profiles_TerminalProfilesHeader"
-                   Style="{StaticResource TextBlockSubHeaderStyle}" />
-
-        <!--  Add Profile accent button  -->
-        <Button x:Name="AddProfileButton"
-                Margin="0,4,0,0"
-                Click="AddProfile_Click"
-                Style="{StaticResource AccentButtonStyle}">
-            <StackPanel Orientation="Horizontal">
-                <FontIcon FontSize="{StaticResource StandardIconSize}"
-                          Glyph="&#xE710;" />
-                <TextBlock x:Uid="Profiles_AddProfileButton"
-                           Style="{StaticResource IconButtonTextBlockStyle}" />
-            </StackPanel>
-        </Button>
-
-        <!--  List of profiles. Each is a NavigatorButtonStyle button rendered by ProfileNavigatorTemplate.  -->
-        <ItemsControl Margin="0,0,0,16"
-                      IsTabStop="False"
-                      ItemTemplate="{StaticResource ProfileNavigatorTemplate}"
-                      ItemsSource="{x:Bind ViewModel.Profiles, Mode=OneWay}"
-                      XYFocusKeyboardNavigation="Enabled">
-            <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <StackPanel />
-                </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-        </ItemsControl>
-    </StackPanel>
-</Page>

src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml

@@ -111,8 +111,6 @@
                               IsChecked="{x:Bind Profile.IsBellStyleFlagSet(2), BindBack=Profile.SetBellStyleWindow, Mode=TwoWay}" />
                     <CheckBox x:Uid="Profile_BellStyleTaskbar"
                               IsChecked="{x:Bind Profile.IsBellStyleFlagSet(4), BindBack=Profile.SetBellStyleTaskbar, Mode=TwoWay}" />
-                    <CheckBox x:Uid="Profile_BellStyleNotification"
-                              IsChecked="{x:Bind Profile.IsBellStyleFlagSet(8), BindBack=Profile.SetBellStyleNotification, Mode=TwoWay}" />
                 </StackPanel>
             </local:SettingContainer>
 

src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml

@@ -80,10 +80,11 @@
                                SourceProfile="{x:Bind Profile, Mode=OneWay}"
                                WindowRoot="{x:Bind WindowRoot, Mode=OneTime}" />
 
-            <!--  Section: Window settings  -->
+            <!--  Grouping: Transparency  -->
             <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock x:Uid="Profile_Section_Window"
+                <TextBlock x:Uid="Profile_TransparencyHeader"
                            Style="{StaticResource TextBlockSubHeaderStyle}" />
+
                 <!--  Opacity  -->
                 <local:SettingContainer x:Name="Opacity"
                                         x:Uid="Profile_Opacity"
@@ -116,6 +117,13 @@
                                   Style="{StaticResource ToggleSwitchInExpanderStyle}" />
                 </local:SettingContainer>
 
+            </StackPanel>
+
+            <!--  Grouping: Window  -->
+            <StackPanel Style="{StaticResource PivotStackStyle}">
+                <TextBlock x:Uid="Profile_WindowHeader"
+                           Style="{StaticResource TextBlockSubHeaderStyle}" />
+
                 <!--  Padding  -->
                 <local:SettingContainer x:Name="Padding"
                                         x:Uid="Profile_Padding"

src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp

@@ -22,9 +22,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         Automation::AutomationProperties::SetFullDescription(StartingDirectoryUseParentCheckbox(), unbox_value<hstring>(startingDirCheckboxTooltip));
 
         Automation::AutomationProperties::SetName(DeleteButton(), RS_(L"Profile_DeleteButton/Text"));
-        AppearanceNavigator().Header(box_value(RS_(L"Profile_Appearance/Header")));
-        TerminalNavigator().Header(box_value(RS_(L"Profile_Terminal/Header")));
-        AdvancedNavigator().Header(box_value(RS_(L"Profile_Advanced/Header")));
+        AppearanceNavigator().Content(box_value(RS_(L"Profile_Appearance/Header")));
+        TerminalNavigator().Content(box_value(RS_(L"Profile_Terminal/Header")));
+        AdvancedNavigator().Content(box_value(RS_(L"Profile_Advanced/Header")));
     }
 
     void Profiles_Base::OnNavigatedTo(const NavigationEventArgs& e)

src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml

@@ -34,171 +34,160 @@
         <StackPanel Grid.Row="1"
                     Style="{StaticResource SettingsStackStyle}">
 
-            <!--  Section: {Profile.Name} profile (or "Profile defaults")  -->
-            <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock Margin="0,0,0,4"
-                           Style="{StaticResource TextBlockSubHeaderStyle}"
-                           Text="{x:Bind Profile.SectionHeaderText, Mode=OneWay}" />
-                <!--  Name  -->
-                <!--
-                    NOTE: Has/Clear is not bound because we don't want the reset button & override text to appear.
-                    Additionally, the JSON stubs generated by auto-generated profiles come with a name,
-                    so the name will always be overridden.
-                -->
-                <local:SettingContainer x:Name="Name"
-                                        x:Uid="Profile_Name"
-                                        CurrentValue="{x:Bind Profile.Name, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}"
-                                        Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
-                    <TextBox Style="{StaticResource TextBoxSettingStyle}"
-                             Text="{x:Bind Profile.Name, Mode=TwoWay}" />
-                </local:SettingContainer>
+            <!--  Name  -->
+            <!--
+                NOTE: Has/Clear is not bound because we don't want the reset button & override text to appear.
+                Additionally, the JSON stubs generated by auto-generated profiles come with a name,
+                so the name will always be overridden.
+            -->
+            <local:SettingContainer x:Name="Name"
+                                    x:Uid="Profile_Name"
+                                    CurrentValue="{x:Bind Profile.Name, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}"
+                                    Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
+                <TextBox Style="{StaticResource TextBoxSettingStyle}"
+                         Text="{x:Bind Profile.Name, Mode=TwoWay}" />
+            </local:SettingContainer>
 
-                <!--  Commandline  -->
-                <local:SettingContainer x:Name="Commandline"
-                                        x:Uid="Profile_Commandline"
-                                        ClearSettingValue="{x:Bind Profile.ClearCommandline}"
-                                        CurrentValue="{x:Bind Profile.Commandline, Mode=OneWay}"
-                                        HasSettingValue="{x:Bind Profile.HasCommandline, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.CommandlineOverrideSource, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}"
-                                        Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
-                    <StackPanel>
-                        <TextBox x:Uid="Profile_CommandlineBox"
-                                 IsSpellCheckEnabled="False"
-                                 Style="{StaticResource TextBoxSettingStyle}"
-                                 Text="{x:Bind Profile.Commandline, Mode=TwoWay}" />
-                        <Button x:Uid="Profile_CommandlineBrowse"
-                                Margin="0,8,0,0"
-                                Click="Commandline_Click"
+            <!--  Commandline  -->
+            <local:SettingContainer x:Name="Commandline"
+                                    x:Uid="Profile_Commandline"
+                                    ClearSettingValue="{x:Bind Profile.ClearCommandline}"
+                                    CurrentValue="{x:Bind Profile.Commandline, Mode=OneWay}"
+                                    HasSettingValue="{x:Bind Profile.HasCommandline, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.CommandlineOverrideSource, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}"
+                                    Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
+                <StackPanel>
+                    <TextBox x:Uid="Profile_CommandlineBox"
+                             IsSpellCheckEnabled="False"
+                             Style="{StaticResource TextBoxSettingStyle}"
+                             Text="{x:Bind Profile.Commandline, Mode=TwoWay}" />
+                    <Button x:Uid="Profile_CommandlineBrowse"
+                            Margin="0,8,0,0"
+                            Click="Commandline_Click"
+                            Style="{StaticResource BrowseButtonStyle}" />
+                </StackPanel>
+            </local:SettingContainer>
+
+            <!--  Starting Directory  -->
+            <local:SettingContainer x:Name="StartingDirectory"
+                                    x:Uid="Profile_StartingDirectory"
+                                    ClearSettingValue="{x:Bind Profile.ClearStartingDirectory}"
+                                    CurrentValue="{x:Bind Profile.CurrentStartingDirectoryPreview, Mode=OneWay}"
+                                    HasSettingValue="{x:Bind Profile.HasStartingDirectory, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.StartingDirectoryOverrideSource, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <StackPanel Orientation="Vertical">
+                    <TextBox x:Uid="Profile_StartingDirectoryBox"
+                             IsEnabled="{x:Bind mtu:Converters.InvertBoolean(Profile.UseParentProcessDirectory), Mode=OneWay}"
+                             IsSpellCheckEnabled="False"
+                             Style="{StaticResource TextBoxSettingStyle}"
+                             Text="{x:Bind Profile.StartingDirectory, Mode=TwoWay}" />
+                    <StackPanel Orientation="Horizontal">
+                        <Button x:Name="StartingDirectoryBrowse"
+                                x:Uid="Profile_StartingDirectoryBrowse"
+                                Margin="0,12,12,0"
+                                Click="StartingDirectory_Click"
+                                IsEnabled="{x:Bind mtu:Converters.InvertBoolean(Profile.UseParentProcessDirectory), Mode=OneWay}"
                                 Style="{StaticResource BrowseButtonStyle}" />
+                        <CheckBox x:Name="StartingDirectoryUseParentCheckbox"
+                                  x:Uid="Profile_StartingDirectoryUseParentCheckbox"
+                                  Margin="0,4,0,0"
+                                  IsChecked="{x:Bind Profile.UseParentProcessDirectory, Mode=TwoWay}" />
                     </StackPanel>
-                </local:SettingContainer>
+                </StackPanel>
+            </local:SettingContainer>
 
-                <!--  Starting Directory  -->
-                <local:SettingContainer x:Name="StartingDirectory"
-                                        x:Uid="Profile_StartingDirectory"
-                                        ClearSettingValue="{x:Bind Profile.ClearStartingDirectory}"
-                                        CurrentValue="{x:Bind Profile.CurrentStartingDirectoryPreview, Mode=OneWay}"
-                                        HasSettingValue="{x:Bind Profile.HasStartingDirectory, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.StartingDirectoryOverrideSource, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}">
-                    <StackPanel Orientation="Vertical">
-                        <TextBox x:Uid="Profile_StartingDirectoryBox"
-                                 IsEnabled="{x:Bind mtu:Converters.InvertBoolean(Profile.UseParentProcessDirectory), Mode=OneWay}"
-                                 IsSpellCheckEnabled="False"
-                                 Style="{StaticResource TextBoxSettingStyle}"
-                                 Text="{x:Bind Profile.StartingDirectory, Mode=TwoWay}" />
-                        <StackPanel Orientation="Horizontal">
-                            <Button x:Name="StartingDirectoryBrowse"
-                                    x:Uid="Profile_StartingDirectoryBrowse"
-                                    Margin="0,12,12,0"
-                                    Click="StartingDirectory_Click"
-                                    IsEnabled="{x:Bind mtu:Converters.InvertBoolean(Profile.UseParentProcessDirectory), Mode=OneWay}"
-                                    Style="{StaticResource BrowseButtonStyle}" />
-                            <CheckBox x:Name="StartingDirectoryUseParentCheckbox"
-                                      x:Uid="Profile_StartingDirectoryUseParentCheckbox"
-                                      Margin="0,4,0,0"
-                                      IsChecked="{x:Bind Profile.UseParentProcessDirectory, Mode=TwoWay}" />
-                        </StackPanel>
-                    </StackPanel>
-                </local:SettingContainer>
+            <!--  Icon  -->
+            <local:SettingContainer x:Name="Icon"
+                                    x:Uid="Profile_Icon"
+                                    ClearSettingValue="{x:Bind Profile.ClearIcon}"
+                                    CurrentValueAccessibleName="{x:Bind Profile.LocalizedIcon, Mode=OneWay}"
+                                    HasSettingValue="{x:Bind Profile.HasIcon, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.IconOverrideSource, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
+                <local:SettingContainer.CurrentValue>
+                    <Grid>
+                        <ContentControl Width="16"
+                                        Height="16"
+                                        Content="{x:Bind Profile.IconPreview, Mode=OneWay}"
+                                        IsTabStop="False"
+                                        Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.UsingNoIcon), Mode=OneWay}" />
+                        <TextBlock Margin="0,0,0,0"
+                                   HorizontalAlignment="Right"
+                                   VerticalAlignment="Center"
+                                   FontFamily="Segoe UI, Segoe Fluent Icons, Segoe MDL2 Assets"
+                                   Style="{StaticResource SettingsPageItemDescriptionStyle}"
+                                   Text="{x:Bind Profile.LocalizedIcon, Mode=OneWay}"
+                                   Visibility="{x:Bind Profile.UsingNoIcon, Mode=OneWay}" />
+                    </Grid>
+                </local:SettingContainer.CurrentValue>
+                <local:SettingContainer.Content>
+                    <local:IconPicker CurrentIconPath="{x:Bind Profile.IconPath, Mode=TwoWay}"
+                                      WindowRoot="{x:Bind WindowRoot, Mode=OneWay}" />
+                </local:SettingContainer.Content>
+            </local:SettingContainer>
 
-                <!--  Elevate  -->
-                <local:SettingContainer x:Name="Elevate"
-                                        x:Uid="Profile_Elevate"
-                                        ClearSettingValue="{x:Bind Profile.ClearElevate}"
-                                        HasSettingValue="{x:Bind Profile.HasElevate, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.ElevateOverrideSource, Mode=OneWay}">
-                    <ToggleSwitch IsOn="{x:Bind Profile.Elevate, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
-            </StackPanel>
+            <!--  Tab Title  -->
+            <local:SettingContainer x:Name="TabTitle"
+                                    x:Uid="Profile_TabTitle"
+                                    ClearSettingValue="{x:Bind Profile.ClearTabTitle}"
+                                    CurrentValue="{x:Bind Profile.TabTitlePreview, Mode=OneWay}"
+                                    HasSettingValue="{x:Bind Profile.HasTabTitle, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.TabTitleOverrideSource, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <TextBox Style="{StaticResource TextBoxSettingStyle}"
+                         Text="{x:Bind Profile.TabTitle, Mode=TwoWay}" />
+            </local:SettingContainer>
 
-            <!--  Section: Visual/UI Affordance  -->
-            <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock x:Uid="Profile_Section_VisualUI"
-                           Style="{StaticResource TextBlockSubHeaderStyle}" />
-                <!--  Tab Title  -->
-                <local:SettingContainer x:Name="TabTitle"
-                                        x:Uid="Profile_TabTitle"
-                                        ClearSettingValue="{x:Bind Profile.ClearTabTitle}"
-                                        CurrentValue="{x:Bind Profile.TabTitlePreview, Mode=OneWay}"
-                                        HasSettingValue="{x:Bind Profile.HasTabTitle, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.TabTitleOverrideSource, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}">
-                    <TextBox Style="{StaticResource TextBoxSettingStyle}"
-                             Text="{x:Bind Profile.TabTitle, Mode=TwoWay}" />
-                </local:SettingContainer>
+            <!--  Tab Color  -->
+            <local:SettingContainer x:Name="TabColor"
+                                    x:Uid="Profile_TabColor"
+                                    ClearSettingValue="{x:Bind Profile.ClearTabColor}"
+                                    CurrentValue="{x:Bind Profile.TabColorPreview, Mode=OneWay}"
+                                    CurrentValueAccessibleName="{x:Bind Profile.TabColorPreview, Converter={StaticResource ColorToStringConverter}, Mode=OneWay}"
+                                    CurrentValueTemplate="{StaticResource ColorPreviewTemplate}"
+                                    HasSettingValue="{x:Bind Profile.HasTabColor, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.TabColorOverrideSource, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
+                <local:NullableColorPicker x:Uid="Profile_TabColor_NullableColorPicker"
+                                           ColorSchemeVM="{x:Bind Profile.DefaultAppearance.CurrentColorScheme, Mode=OneWay}"
+                                           CurrentColor="{x:Bind Profile.TabColor, Mode=TwoWay}"
+                                           NullColorPreview="{x:Bind Profile.TabThemeColorPreview, Mode=OneWay}" />
+            </local:SettingContainer>
 
-                <!--  Tab Color  -->
-                <local:SettingContainer x:Name="TabColor"
-                                        x:Uid="Profile_TabColor"
-                                        ClearSettingValue="{x:Bind Profile.ClearTabColor}"
-                                        CurrentValue="{x:Bind Profile.TabColorPreview, Mode=OneWay}"
-                                        CurrentValueAccessibleName="{x:Bind Profile.TabColorPreview, Converter={StaticResource ColorToStringConverter}, Mode=OneWay}"
-                                        CurrentValueTemplate="{StaticResource ColorPreviewTemplate}"
-                                        HasSettingValue="{x:Bind Profile.HasTabColor, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.TabColorOverrideSource, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}">
-                    <local:NullableColorPicker x:Uid="Profile_TabColor_NullableColorPicker"
-                                               ColorSchemeVM="{x:Bind Profile.DefaultAppearance.CurrentColorScheme, Mode=OneWay}"
-                                               CurrentColor="{x:Bind Profile.TabColor, Mode=TwoWay}"
-                                               NullColorPreview="{x:Bind Profile.TabThemeColorPreview, Mode=OneWay}" />
-                </local:SettingContainer>
+            <!--  Elevate  -->
+            <local:SettingContainer x:Name="Elevate"
+                                    x:Uid="Profile_Elevate"
+                                    ClearSettingValue="{x:Bind Profile.ClearElevate}"
+                                    HasSettingValue="{x:Bind Profile.HasElevate, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.ElevateOverrideSource, Mode=OneWay}">
+                <ToggleSwitch IsOn="{x:Bind Profile.Elevate, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <!--  Icon  -->
-                <local:SettingContainer x:Name="Icon"
-                                        x:Uid="Profile_Icon"
-                                        ClearSettingValue="{x:Bind Profile.ClearIcon}"
-                                        CurrentValueAccessibleName="{x:Bind Profile.LocalizedIcon, Mode=OneWay}"
-                                        HasSettingValue="{x:Bind Profile.HasIcon, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.IconOverrideSource, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}">
-                    <local:SettingContainer.CurrentValue>
-                        <Grid>
-                            <ContentControl Width="16"
-                                            Height="16"
-                                            Content="{x:Bind Profile.IconPreview, Mode=OneWay}"
-                                            IsTabStop="False"
-                                            Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.UsingNoIcon), Mode=OneWay}" />
-                            <TextBlock Margin="0,0,0,0"
-                                       HorizontalAlignment="Right"
-                                       VerticalAlignment="Center"
-                                       FontFamily="Segoe UI, Segoe Fluent Icons, Segoe MDL2 Assets"
-                                       Style="{StaticResource SettingsPageItemDescriptionStyle}"
-                                       Text="{x:Bind Profile.LocalizedIcon, Mode=OneWay}"
-                                       Visibility="{x:Bind Profile.UsingNoIcon, Mode=OneWay}" />
-                        </Grid>
-                    </local:SettingContainer.CurrentValue>
-                    <local:SettingContainer.Content>
-                        <local:IconPicker CurrentIconPath="{x:Bind Profile.IconPath, Mode=TwoWay}"
-                                          WindowRoot="{x:Bind WindowRoot, Mode=OneWay}" />
-                    </local:SettingContainer.Content>
-                </local:SettingContainer>
-
-                <!--  Hidden  -->
-                <local:SettingContainer x:Name="Hidden"
-                                        x:Uid="Profile_Hidden"
-                                        Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
-                    <ToggleSwitch IsOn="{x:Bind Profile.Hidden, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
-            </StackPanel>
+            <!--  Hidden  -->
+            <local:SettingContainer x:Name="Hidden"
+                                    x:Uid="Profile_Hidden"
+                                    Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
+                <ToggleSwitch IsOn="{x:Bind Profile.Hidden, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
             <TextBlock x:Uid="Profile_AdditionalSettingsHeader"
                        Margin="0,32,0,4"
                        Style="{StaticResource TextBlockSubHeaderStyle}" />
 
-            <local:SettingsCard x:Name="AppearanceNavigator"
-                                Click="Appearance_Click"
-                                IsClickEnabled="True" />
-            <local:SettingsCard x:Name="TerminalNavigator"
-                                Click="Terminal_Click"
-                                IsClickEnabled="True" />
-            <local:SettingsCard x:Name="AdvancedNavigator"
-                                Click="Advanced_Click"
-                                IsClickEnabled="True" />
+            <Button x:Name="AppearanceNavigator"
+                    Click="Appearance_Click"
+                    Style="{StaticResource NavigatorButtonStyle}" />
+            <Button x:Name="TerminalNavigator"
+                    Click="Terminal_Click"
+                    Style="{StaticResource NavigatorButtonStyle}" />
+            <Button x:Name="AdvancedNavigator"
+                    Click="Advanced_Click"
+                    Style="{StaticResource NavigatorButtonStyle}" />
             <!--  Delete Button  -->
             <Border MaxWidth="{StaticResource StandardControlMaxWidth}">
                 <Button x:Name="DeleteButton"

src/cascadia/TerminalSettingsEditor/Rendering.cpp

@@ -0,0 +1,31 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "Rendering.h"
+#include "Rendering.g.cpp"
+
+using namespace winrt::Windows::UI::Xaml::Navigation;
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    Rendering::Rendering()
+    {
+        InitializeComponent();
+    }
+
+    void Rendering::OnNavigatedTo(const NavigationEventArgs& e)
+    {
+        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
+        _ViewModel = args.ViewModel().as<Editor::RenderingViewModel>();
+        BringIntoViewWhenLoaded(args.ElementToFocus());
+
+        TraceLoggingWrite(
+            g_hTerminalSettingsEditorProvider,
+            "NavigatedToPage",
+            TraceLoggingDescription("Event emitted when the user navigates to a page in the settings UI"),
+            TraceLoggingValue("rendering", "PageId", "The identifier of the page that was navigated to"),
+            TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
+            TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
+    }
+}

src/cascadia/TerminalSettingsEditor/Rendering.h

@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#pragma once
+
+#include "Rendering.g.h"
+#include "Utils.h"
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    struct Rendering : public HasScrollViewer<Rendering>, RenderingT<Rendering>
+    {
+        Rendering();
+
+        void OnNavigatedTo(const winrt::Windows::UI::Xaml::Navigation::NavigationEventArgs& e);
+
+        til::property_changed_event PropertyChanged;
+        WINRT_OBSERVABLE_PROPERTY(Editor::RenderingViewModel, ViewModel, PropertyChanged.raise, nullptr);
+    };
+}
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
+{
+    BASIC_FACTORY(Rendering);
+}

src/cascadia/TerminalSettingsEditor/Rendering.idl

@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import "RenderingViewModel.idl";
+
+namespace Microsoft.Terminal.Settings.Editor
+{
+    [default_interface] runtimeclass Rendering : Windows.UI.Xaml.Controls.Page
+    {
+        Rendering();
+        RenderingViewModel ViewModel { get; };
+    }
+}