[PICK] Cherry-pick loc key from 83d35c119

(cherry picked from commit 95f63a9100)
Update Cascadia Code to 2102.25 (#9295 )
2026-04-06 14:19:45 +00:00 · 2021-02-25 14:48:51 -08:00 · 2021-02-25 14:48:22 -08:00 · 2021-02-25 14:48:21 -08:00 · 2021-02-25 14:48:21 -08:00 · 2021-02-25 14:48:21 -08:00
17 changed files with 86 additions and 124 deletions
--- a/OpenConsole.sln
+++ b/OpenConsole.sln
@@ -2410,8 +2410,6 @@ Global
 		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Release|x86.ActiveCfg = Release|Win32
 		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Release|x86.Build.0 = Release|Win32
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|Any CPU.ActiveCfg = Release|Any CPU
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|Any CPU.Build.0 = Release|Any CPU
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|Any CPU.Deploy.0 = Release|Any CPU
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|ARM.ActiveCfg = Debug|ARM
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|ARM.Build.0 = Debug|ARM
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|ARM.Deploy.0 = Debug|ARM
@@ -2419,11 +2417,7 @@ Global
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|ARM64.Build.0 = Debug|ARM64
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|ARM64.Deploy.0 = Debug|ARM64
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|DotNet_x64Test.ActiveCfg = Release|Any CPU
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|DotNet_x64Test.Build.0 = Release|Any CPU
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|DotNet_x64Test.Deploy.0 = Release|Any CPU
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|DotNet_x86Test.ActiveCfg = Release|Any CPU
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|DotNet_x86Test.Build.0 = Release|Any CPU
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|DotNet_x86Test.Deploy.0 = Release|Any CPU
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|x64.ActiveCfg = Debug|x64
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|x64.Build.0 = Debug|x64
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|x64.Deploy.0 = Debug|x64
@@ -2431,8 +2425,6 @@ Global
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|x86.Build.0 = Debug|x86
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|x86.Deploy.0 = Debug|x86
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|ARM.ActiveCfg = Debug|ARM
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|ARM.Build.0 = Debug|ARM
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -2440,11 +2432,7 @@ Global
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|ARM64.Build.0 = Debug|ARM64
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|ARM64.Deploy.0 = Debug|ARM64
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|DotNet_x64Test.ActiveCfg = Debug|Any CPU
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|DotNet_x64Test.Build.0 = Debug|Any CPU
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|DotNet_x64Test.Deploy.0 = Debug|Any CPU
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|DotNet_x86Test.ActiveCfg = Debug|Any CPU
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|DotNet_x86Test.Build.0 = Debug|Any CPU
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|DotNet_x86Test.Deploy.0 = Debug|Any CPU
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|x64.ActiveCfg = Debug|x64
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|x64.Build.0 = Debug|x64
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|x64.Deploy.0 = Debug|x64
@@ -2452,8 +2440,6 @@ Global
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|x86.Build.0 = Debug|x86
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|x86.Deploy.0 = Debug|x86
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|Any CPU.Deploy.0 = Release|Any CPU
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|ARM.ActiveCfg = Release|ARM
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|ARM.Build.0 = Release|ARM
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|ARM.Deploy.0 = Release|ARM
@@ -2461,11 +2447,7 @@ Global
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|ARM64.Build.0 = Release|ARM64
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|ARM64.Deploy.0 = Release|ARM64
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|DotNet_x64Test.ActiveCfg = Release|Any CPU
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|DotNet_x64Test.Build.0 = Release|Any CPU
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|DotNet_x64Test.Deploy.0 = Release|Any CPU
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|DotNet_x86Test.ActiveCfg = Release|Any CPU
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|DotNet_x86Test.Build.0 = Release|Any CPU
-		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|DotNet_x86Test.Deploy.0 = Release|Any CPU
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|x64.ActiveCfg = Release|x64
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|x64.Build.0 = Release|x64
 		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|x64.Deploy.0 = Release|x64
--- a/res/Cascadia.ttf
+++ b/res/Cascadia.ttf
--- a/res/CascadiaMono.ttf
+++ b/res/CascadiaMono.ttf
--- a/res/README.md
+++ b/res/README.md
@@ -17,5 +17,5 @@ Please consult the [license](https://raw.githubusercontent.com/microsoft/cascadi

 ### Fonts Included

-* Cascadia Code, Cascadia Mono (2102.03)
-   * from microsoft/cascadia-code@b358d1ba3d1629c113671312b18eab52797cc055
+* Cascadia Code, Cascadia Mono (2102.25)
+   * from microsoft/cascadia-code@911dc421f333e3b72b97381d16fee5b71eb48f04
--- a/src/cascadia/TerminalApp/CommandPalette.xaml
+++ b/src/cascadia/TerminalApp/CommandPalette.xaml
@@ -32,7 +32,6 @@ the MIT License. See LICENSE in the project root for license information. -->
            <local:EmptyStringVisibilityConverter x:Key="CommandKeyChordVisibilityConverter"/>
            <local:EmptyStringVisibilityConverter x:Key="ParsedCommandLineTextVisibilityConverter"/>
            <local:EmptyStringVisibilityConverter x:Key="ParentCommandVisibilityConverter"/>
-            <local:HasNestedCommandsVisibilityConverter x:Key="HasNestedCommandsVisibilityConverter"/>
            <model:IconPathConverter x:Key="IconSourceConverter"/>

            <DataTemplate x:Key="GeneralItemTemplate" x:DataType="local:FilteredCommand">
@@ -43,6 +42,70 @@ the MIT License. See LICENSE in the project root for license information. -->
                                  AutomationProperties.Name="{x:Bind Item.Name, Mode=OneWay}"
                                  AutomationProperties.AcceleratorKey="{x:Bind Item.KeyChordText, Mode=OneWay}">

+                    <Grid HorizontalAlignment="Stretch" ColumnSpacing="8" >
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="16"/>
+                            <!-- icon -->
+                            <ColumnDefinition Width="Auto"/>
+                            <!-- command label -->
+                            <ColumnDefinition Width="*"/>
+                            <!-- key chord -->
+                            <ColumnDefinition Width="16"/>
+                            <!-- gutter for scrollbar -->
+                        </Grid.ColumnDefinitions>
+
+                        <IconSourceElement
+                                    Grid.Column="0"
+                                    Width="16"
+                                    Height="16"
+                                    IconSource="{x:Bind Item.Icon,
+                                                        Mode=OneWay,
+                                                        Converter={StaticResource IconSourceConverter}}"/>
+
+                        <local:HighlightedTextControl
+                                    Grid.Column="1"
+                                    HorizontalAlignment="Left"
+                                    Text="{x:Bind HighlightedName, Mode=OneWay}"/>
+
+                        <!-- The block for the key chord is only visible
+                                when there's actual text set as the label. See
+                                CommandKeyChordVisibilityConverter for details.
+                             We're setting the accessibility view on the
+                                border and text block to Raw because otherwise,
+                                Narrator will read out the key chord. Problem is,
+                                it already did that because it was the list item's
+                                "AcceleratorKey". It's redundant. -->
+                        <Border
+                                    Grid.Column="2"
+                                    Visibility="{x:Bind Item.KeyChordText,
+                                                 Mode=OneWay,
+                                                 Converter={StaticResource CommandKeyChordVisibilityConverter}}"
+                                    Style="{ThemeResource KeyChordBorderStyle}"
+                                    Padding="2,0,2,0"
+                                    HorizontalAlignment="Right"
+                                    VerticalAlignment="Center"
+                                    AutomationProperties.AccessibilityView="Raw">
+
+                            <TextBlock
+                                        Style="{ThemeResource KeyChordTextBlockStyle}"
+                                        FontSize="12"
+                                        Text="{x:Bind Item.KeyChordText, Mode=OneWay}"
+                                        AutomationProperties.AccessibilityView="Raw" />
+                        </Border>
+
+                    </Grid>
+                </ListViewItem>
+            </DataTemplate>
+
+            <DataTemplate x:Key="NestedItemTemplate" x:DataType="local:FilteredCommand">
+
+                <!-- This HorizontalContentAlignment="Stretch" is important
+                        to make sure it takes the entire width of the line -->
+                <ListViewItem x:Uid="CommandPalette_MoreOptions"
+                              HorizontalContentAlignment="Stretch"
+                              AutomationProperties.Name="{x:Bind Item.Name, Mode=OneWay}"
+                              AutomationProperties.AcceleratorKey="{x:Bind Item.KeyChordText, Mode=OneWay}">
+
                    <Grid HorizontalAlignment="Stretch" ColumnSpacing="8" >
                        <Grid.ColumnDefinitions>
                            <ColumnDefinition Width="16"/>
@@ -99,9 +162,6 @@ the MIT License. See LICENSE in the project root for license information. -->
                                    FontFamily="Segoe MDL2 Assets"
                                    Glyph="&#xE70E;"
                                    HorizontalAlignment="Right"
-                                    Visibility="{x:Bind Item,
-                                                 Mode=OneWay,
-                                                 Converter={StaticResource HasNestedCommandsVisibilityConverter}}"
                                    Grid.Column="2">

                            <FontIcon.RenderTransform>
@@ -191,7 +251,10 @@ the MIT License. See LICENSE in the project root for license information. -->
                </ListViewItem>
            </DataTemplate>

-            <local:PaletteItemTemplateSelector x:Key="PaletteItemTemplateSelector" TabItemTemplate="{StaticResource TabItemTemplate}" GeneralItemTemplate="{StaticResource GeneralItemTemplate}"/>
+            <local:PaletteItemTemplateSelector x:Key="PaletteItemTemplateSelector"
+                                               TabItemTemplate="{StaticResource TabItemTemplate}"
+                                               GeneralItemTemplate="{StaticResource GeneralItemTemplate}"
+                                               NestedItemTemplate="{StaticResource NestedItemTemplate}"/>

            <ResourceDictionary.ThemeDictionaries>
                <ResourceDictionary x:Key="Dark">
--- a/src/cascadia/TerminalApp/HasNestedCommandsVisibilityConverter.cpp
+++ b/src/cascadia/TerminalApp/HasNestedCommandsVisibilityConverter.cpp
@@ -1,39 +0,0 @@
-#include "pch.h"
-#include "HasNestedCommandsVisibilityConverter.h"
-#include "HasNestedCommandsVisibilityConverter.g.cpp"
-
-using namespace winrt::Windows;
-using namespace winrt::Windows::UI::Xaml;
-
-namespace winrt::TerminalApp::implementation
-{
-    // Method Description:
-    // - Attempt to convert something into another type. For the
-    //   HasNestedCommandsVisibilityConverter, we're gonna check if `value` is a
-    //   string, and try and convert it into a Visibility value. If the input
-    //   param wasn't a string, or was the empty string, we'll return
-    //   Visibility::Collapsed. Otherwise, we'll return Visible.
-
-    // Arguments:
-    // - value: the input object to attempt to convert into a Visibility.
-    // Return Value:
-    // - Visible if the object was a string and wasn't the empty string.
-    Foundation::IInspectable HasNestedCommandsVisibilityConverter::Convert(Foundation::IInspectable const& value,
-                                                                           Windows::UI::Xaml::Interop::TypeName const& /* targetType */,
-                                                                           Foundation::IInspectable const& /* parameter */,
-                                                                           hstring const& /* language */)
-    {
-        const auto paletteItem{ value.try_as<winrt::TerminalApp::ActionPaletteItem>() };
-        const auto& hasNestedCommands = paletteItem && paletteItem.Command().HasNestedCommands();
-        return winrt::box_value(hasNestedCommands ? Visibility::Visible : Visibility::Collapsed);
-    }
-
-    // unused for one-way bindings
-    Foundation::IInspectable HasNestedCommandsVisibilityConverter::ConvertBack(Foundation::IInspectable const& /* value */,
-                                                                               Windows::UI::Xaml::Interop::TypeName const& /* targetType */,
-                                                                               Foundation::IInspectable const& /* parameter */,
-                                                                               hstring const& /* language */)
-    {
-        throw hresult_not_implemented();
-    }
-}
--- a/src/cascadia/TerminalApp/HasNestedCommandsVisibilityConverter.h
+++ b/src/cascadia/TerminalApp/HasNestedCommandsVisibilityConverter.h
@@ -1,27 +0,0 @@
-#pragma once
-
-#include "HasNestedCommandsVisibilityConverter.g.h"
-#include "../inc/cppwinrt_utils.h"
-
-namespace winrt::TerminalApp::implementation
-{
-    struct HasNestedCommandsVisibilityConverter : HasNestedCommandsVisibilityConverterT<HasNestedCommandsVisibilityConverter>
-    {
-        HasNestedCommandsVisibilityConverter() = default;
-
-        Windows::Foundation::IInspectable Convert(Windows::Foundation::IInspectable const& value,
-                                                  Windows::UI::Xaml::Interop::TypeName const& targetType,
-                                                  Windows::Foundation::IInspectable const& parameter,
-                                                  hstring const& language);
-
-        Windows::Foundation::IInspectable ConvertBack(Windows::Foundation::IInspectable const& value,
-                                                      Windows::UI::Xaml::Interop::TypeName const& targetType,
-                                                      Windows::Foundation::IInspectable const& parameter,
-                                                      hstring const& language);
-    };
-}
-
-namespace winrt::TerminalApp::factory_implementation
-{
-    BASIC_FACTORY(HasNestedCommandsVisibilityConverter);
-}
--- a/src/cascadia/TerminalApp/HasNestedCommandsVisibilityConverter.idl
+++ b/src/cascadia/TerminalApp/HasNestedCommandsVisibilityConverter.idl
@@ -1,19 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-namespace TerminalApp
-{
-    // See https://docs.microsoft.com/en-us/windows/uwp/data-binding/data-binding-quickstart
-
-    // We use the default attribute to declare IValueConverter as the default
-    // interface. In the listing, HasNestedCommandsVisibilityConverter has only a
-    // constructor, and no methods, so no default interface is generated for it.
-    // The default attribute is optimal if you won't be adding instance members
-    // to HasNestedCommandsVisibilityConverter, because no QueryInterface will be
-    // required to call the IValueConverter methods
-    runtimeclass HasNestedCommandsVisibilityConverter : [default] Windows.UI.Xaml.Data.IValueConverter
-    {
-        HasNestedCommandsVisibilityConverter();
-    };
-
-}
--- a/src/cascadia/TerminalApp/PaletteItemTemplateSelector.cpp
+++ b/src/cascadia/TerminalApp/PaletteItemTemplateSelector.cpp
@@ -30,6 +30,13 @@ namespace winrt::TerminalApp::implementation
            {
                return TabItemTemplate();
            }
+            else if (const auto actionPaletteItem{ filteredCommand.Item().try_as<winrt::TerminalApp::ActionPaletteItem>() })
+            {
+                if (actionPaletteItem.Command().HasNestedCommands())
+                {
+                    return NestedItemTemplate();
+                }
+            }
        }

        return GeneralItemTemplate();
--- a/src/cascadia/TerminalApp/PaletteItemTemplateSelector.h
+++ b/src/cascadia/TerminalApp/PaletteItemTemplateSelector.h
@@ -16,6 +16,7 @@ namespace winrt::TerminalApp::implementation
        Windows::UI::Xaml::DataTemplate SelectTemplateCore(winrt::Windows::Foundation::IInspectable const&);

        GETSET_PROPERTY(winrt::Windows::UI::Xaml::DataTemplate, TabItemTemplate);
+        GETSET_PROPERTY(winrt::Windows::UI::Xaml::DataTemplate, NestedItemTemplate);
        GETSET_PROPERTY(winrt::Windows::UI::Xaml::DataTemplate, GeneralItemTemplate);
    };
 }
--- a/src/cascadia/TerminalApp/PaletteItemTemplateSelector.idl
+++ b/src/cascadia/TerminalApp/PaletteItemTemplateSelector.idl
@@ -8,6 +8,7 @@ namespace TerminalApp
        PaletteItemTemplateSelector();

        Windows.UI.Xaml.DataTemplate TabItemTemplate;
+        Windows.UI.Xaml.DataTemplate NestedItemTemplate;
        Windows.UI.Xaml.DataTemplate GeneralItemTemplate;
    }
 }
--- a/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
@@ -451,7 +451,7 @@
  </data>
  <data name="CommandPalette_ParsedCommandLine" xml:space="preserve">
    <value>Executing command line will invoke the following commands:</value>
-	<comment>Will be followed by a list of strings describing parsed commands</comment>
+    <comment>Will be followed by a list of strings describing parsed commands</comment>
  </data>
  <data name="CommandPalette_FailedParsingCommandLine" xml:space="preserve">
    <value>Failed parsing command line:</value>
@@ -559,4 +559,7 @@
  <data name="ClipboardTextHeader.Text" xml:space="preserve">
    <value>Clipboard contents (preview):</value>
  </data>
+  <data name="CommandPalette_MoreOptions.[using:Windows.UI.Xaml.Automation]AutomationProperties.HelpText" xml:space="preserve">
+    <value>More options</value>
+  </data>
 </root>
--- a/src/cascadia/TerminalApp/TabBase.cpp
+++ b/src/cascadia/TerminalApp/TabBase.cpp
@@ -62,7 +62,6 @@ namespace winrt::TerminalApp::implementation

        // Build the menu
        Controls::MenuFlyout newTabFlyout;
-        newTabFlyout.Items().Append(_CreateCloseSubMenu());
        newTabFlyout.Items().Append(closeTabMenuItem);
        TabViewItem().ContextFlyout(newTabFlyout);
    }
--- a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj
+++ b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj
@@ -124,9 +124,6 @@
    <ClInclude Include="EmptyStringVisibilityConverter.h">
      <DependentUpon>EmptyStringVisibilityConverter.idl</DependentUpon>
    </ClInclude>
-    <ClInclude Include="HasNestedCommandsVisibilityConverter.h">
-      <DependentUpon>HasNestedCommandsVisibilityConverter.idl</DependentUpon>
-    </ClInclude>
    <ClInclude Include="Pane.h" />
    <ClInclude Include="ColorHelper.h" />
    <ClInclude Include="TerminalSettings.h">
@@ -204,9 +201,6 @@
    <ClCompile Include="EmptyStringVisibilityConverter.cpp">
      <DependentUpon>EmptyStringVisibilityConverter.idl</DependentUpon>
    </ClCompile>
-    <ClCompile Include="HasNestedCommandsVisibilityConverter.cpp">
-      <DependentUpon>HasNestedCommandsVisibilityConverter.idl</DependentUpon>
-    </ClCompile>
    <ClCompile Include="Pane.cpp" />
    <ClCompile Include="Pane.LayoutSizeNode.cpp" />
    <ClCompile Include="ColorHelper.cpp" />
@@ -293,7 +287,6 @@
    </Midl>
    <Midl Include="FilteredCommand.idl" />
    <Midl Include="EmptyStringVisibilityConverter.idl" />
-    <Midl Include="HasNestedCommandsVisibilityConverter.idl" />
    <Midl Include="TerminalSettings.idl" />
  </ItemGroup>
  <!-- ========================= Misc Files ======================== -->
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -658,7 +658,7 @@ namespace winrt::TerminalApp::implementation
                settingsItem.Click({ this, &TerminalPage::_SettingsButtonOnClick });
                newTabFlyout.Items().Append(settingsItem);

-                Microsoft::Terminal::Settings::Model::OpenSettingsArgs args{ SettingsTarget::SettingsFile };
+                Microsoft::Terminal::Settings::Model::OpenSettingsArgs args{ SettingsTarget::SettingsUI };
                Microsoft::Terminal::Settings::Model::ActionAndArgs settingsAction{ ShortcutAction::OpenSettings, args };
                const auto settingsKeyChord{ keyBindings.GetKeyBindingForActionWithArgs(settingsAction) };
                if (settingsKeyChord)
@@ -882,7 +882,7 @@ namespace winrt::TerminalApp::implementation

        if (debugConnection) // this will only be set if global debugging is on and tap is active
        {
-            TermControl newControl{ settings, debugConnection };
+            TermControl newControl{ *(winrt::get_self<TerminalSettings>(settings)->CreateChild()), debugConnection };
            _RegisterTerminalEvents(newControl, *newTabImpl);
            // Split (auto) with the debug tap.
            newTabImpl->SplitPane(SplitState::Automatic, 0.5f, profileGuid, newControl);
@@ -1865,7 +1865,7 @@ namespace winrt::TerminalApp::implementation
                return;
            }

-            TermControl newControl{ controlSettings, controlConnection };
+            TermControl newControl{ *(winrt::get_self<TerminalSettings>(controlSettings)->CreateChild()), controlConnection };

            // Hookup our event handlers to the new terminal
            _RegisterTerminalEvents(newControl, *focusedTab);
--- a/src/cascadia/TerminalApp/TerminalTab.cpp
+++ b/src/cascadia/TerminalApp/TerminalTab.cpp
@@ -847,7 +847,6 @@ namespace winrt::TerminalApp::implementation
        newTabFlyout.Items().Append(chooseColorMenuItem);
        newTabFlyout.Items().Append(renameTabMenuItem);
        newTabFlyout.Items().Append(menuSeparator);
-        newTabFlyout.Items().Append(_CreateCloseSubMenu());
        newTabFlyout.Items().Append(closeTabMenuItem);
        TabViewItem().ContextFlyout(newTabFlyout);
    }
--- a/src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp
+++ b/src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp
@@ -598,7 +598,6 @@ void CascadiaSettings::_ParseAndLayerFragmentFiles(const std::unordered_set<std:
                        auto childImpl{ matchingProfile->CreateChild() };
                        childImpl->LayerJson(profileStub);
                        childImpl->Origin(OriginTag::Fragment);
-                        childImpl->Source(source);

                        // replace parent in _profiles with child
                        _allProfiles.SetAt(_FindMatchingProfileIndex(matchingProfile->ToJson()).value(), *childImpl);
Author	SHA1	Message	Date
Dustin Howett	89c9e6db84	[PICK] Cherry-pick loc key from `83d35c119` (cherry picked from commit `95f63a9100`)	2021-02-25 14:48:51 -08:00
Dustin L. Howett	f5f330a019	Update Cascadia Code to 2102.25 (#9295 ) This update fixes some issues in Cascadia Code's February update: microsoft/cascadia-code#406 - updated anchor type to lock with the other equals-related ligatures microsoft/cascadia-code#408 - corrected component used for glyph to align with Unicode microsoft/cascadia-code#412 - updated locl features removing iacute_j ligature and Catalan substitution microsoft/cascadia-code#414 - increased overlaps of middle glyph for arrow ligatures microsoft/cascadia-code#415 - reduces width of macronbelow microsoft/cascadia-code#416 - rolls back name ID 4 modification as JetBrains cannot process it correctly microsoft/cascadia-code#428 - rolls back variation of the underline to prevent MVAR table generation Full changelist: * Repositioned tilde in related ligatures. Previously it was higher than the standard one. * Added missing vietnamese anchors on acute and grave (futureproofing). * Corrected / made consistent greater & less positioning in </> and <$> related ligatures. * Otherwise reviewed hinting (cherry picked from commit `cb03b97e67`)	2021-02-25 14:48:22 -08:00
PankajBhojwani	ec89b85462	Fix updating with fragments ignoring original profile settings (#9293 ) Turns out we were adding the fragment source to profiles we update. This PR fixes it so we keep the original source. ## Validation Steps Performed Existing profile settings are maintained Closes #9290 (cherry picked from commit `f26c246c7c`)	2021-02-25 14:48:21 -08:00
Carlos Zamora	e295cc4ae2	Update dropdown's settings keyboard accelerator (#9294 ) Fixes a bug introduced by #9224 where the wrong keyboard accelerator would appear in the new tab dropdown. We were looking for the "settings file" version of the action, as opposed to the "settings UI" version. ## References #9224 - Settings UI as default #6800 - Settings UI Epic (cherry picked from commit `649c546960`)	2021-02-25 14:48:21 -08:00
PankajBhojwani	e103ca59e4	Fix settings not updating on reload (#9289 ) In #8602, we started passing a child of the `TerminalSettings` to the control upon tab initialization, but forgot to do the same when new controls get created on a pane split. ## Validation Steps Performed Settings reload with multiple panes works Closes #9280 (cherry picked from commit `a930aa390e`)	2021-02-25 14:48:21 -08:00
Carlos Zamora	28c7890cbc	Add help text to 'more options' in command palette (#9271 ) Similar to #9262. This creates another data template specifically for command palette items that open up more options. We leverage the localization key from #9262 to apply help text to this template automatically. Using the data template approach, we now have no need for the `HasNestedComandsVisibilityConverter`, so that set of files is now deleted. The logic to detect nested commands was moved to the template selector. ## Validation Steps Performed Tested using NVDA. Addresses #7908 better (cherry picked from commit `d1bf0fcd1e`)	2021-02-24 12:02:19 -08:00
Dustin L. Howett	4dee531aee	Exclude MonarchPeasantPackage from AnyCPU/DotNet*Test configs (#9272 ) Visual Studio automatically enabled this package to build in all configurations. This results in a build error when we go to pack the WPF control. (cherry picked from commit `66033dcb01`)	2021-02-24 11:34:58 -08:00
Dustin L. Howett	c951a70208	[RELEASE ONLY] Remove the close submenu (#9102 ) There's a platform issue that causes it to crash. Fixes #8944. (cherry picked from commit `5fdd1560fd`)	2021-02-23 16:41:36 -08:00