Change the default tab switch mode back to inOrder (#8326)

We changed the default to "mru", and that was unkind to all our existing users.

(cherry picked from commit a52a1d3b8d)

doc/cascadia/profiles.schema.json

@@ -694,7 +694,7 @@
               "enum": [
                 "mru",
                 "inOrder",
-                "disabled",
+                "disabled"
               ],
               "type": "string"
             }
@@ -702,7 +702,7 @@
           "deprecated": true
         },
         "tabSwitcherMode": {
-          "default": true,
+          "default": "inOrder",
           "description": "When set to \"true\" or \"mru\", the \"nextTab\" and \"prevTab\" commands will use the tab switcher UI, with most-recently-used ordering. When set to \"inOrder\", these actions will switch tabs in their current ordering. Set to \"false\" to disable the tab switcher.",
           "oneOf": [
             {
@@ -712,7 +712,7 @@
               "enum": [
                 "mru",
                 "inOrder",
-                "disabled",
+                "disabled"
               ],
               "type": "string"
             }

src/cascadia/TerminalApp/CommandPalette.xaml

@@ -178,6 +178,7 @@ the MIT License. See LICENSE in the project root for license information. -->
                 x:Name="_prefixCharacter"
                 Margin="16,16,0,-8"
                 FontSize="14"
+                HorizontalAlignment="Left"
                 Visibility="{x:Bind PrefixCharacter,
                              Mode=OneWay,
                              Converter={StaticResource ParentCommandVisibilityConverter}}"
@@ -185,35 +186,35 @@ the MIT License. See LICENSE in the project root for license information. -->
                 >
             </TextBlock>
 
-          <StackPanel Orientation="Horizontal"
-                    Padding="16, 0, 16, 4"
-                    Grid.Row="1"
-                    Visibility="{x:Bind ParentCommandName,
-                                 Mode=OneWay,
-                                 Converter={StaticResource ParentCommandVisibilityConverter}}">
-
-                <Button
-                    Background="Transparent"
-                    x:Name="_parentCommandBackButton"
-                    x:Uid="ParentCommandBackButton"
-                    Click="_moveBackButtonClicked"
-                    ClickMode="Press"
-                    VerticalAlignment="Center">
-                    <FontIcon 
-                        FontSize="12"
-                        FontFamily="Segoe MDL2 Assets" 
-                        Glyph="&#xE76b;">
-                    </FontIcon>
-                </Button>
-
-                <TextBlock
-                    Padding="16, 0, 16, 4"
-                    x:Name="_parentCommandText"
-                    FontStyle="Italic"
-                    Grid.Row="1"
-                    Text="{x:Bind ParentCommandName, Mode=OneWay}"
-                    VerticalAlignment="Center">
-                </TextBlock>
+            <StackPanel Orientation="Horizontal"
+                    Padding="16, 0, 16, 4"
+                    Grid.Row="1"
+                    Visibility="{x:Bind ParentCommandName,
+                                 Mode=OneWay,
+                                 Converter={StaticResource ParentCommandVisibilityConverter}}">
+
+                <Button
+                    Background="Transparent"
+                    x:Name="_parentCommandBackButton"
+                    x:Uid="ParentCommandBackButton"
+                    Click="_moveBackButtonClicked"
+                    ClickMode="Press"
+                    VerticalAlignment="Center">
+                    <FontIcon
+                        FontSize="12"
+                        FontFamily="Segoe MDL2 Assets"
+                        Glyph="&#xE76b;">
+                    </FontIcon>
+                </Button>
+
+                <TextBlock
+                    Padding="16, 0, 16, 4"
+                    x:Name="_parentCommandText"
+                    FontStyle="Italic"
+                    Grid.Row="1"
+                    Text="{x:Bind ParentCommandName, Mode=OneWay}"
+                    VerticalAlignment="Center">
+                </TextBlock>
             </StackPanel>
 
             <TextBlock
@@ -267,7 +268,7 @@ the MIT License. See LICENSE in the project root for license information. -->
                                     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. -->

src/cascadia/TerminalApp/Pane.cpp

@@ -1093,13 +1093,14 @@ void Pane::_SetupEntranceAnimation()
     // Windows" setting in the OS
     winrt::Windows::UI::ViewManagement::UISettings uiSettings;
     const auto animationsEnabledInOS = uiSettings.AnimationsEnabled();
+    const auto animationsEnabledInApp = Media::Animation::Timeline::AllowDependentAnimations();
 
     const bool splitWidth = _splitState == SplitState::Vertical;
     const auto totalSize = splitWidth ? _root.ActualWidth() : _root.ActualHeight();
     // If we don't have a size yet, it's likely that we're in startup, or we're
     // being executed as a sequence of actions. In that case, just skip the
     // animation.
-    if (totalSize <= 0 || !animationsEnabledInOS)
+    if (totalSize <= 0 || !animationsEnabledInOS || !animationsEnabledInApp)
     {
         return;
     }

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -1206,6 +1206,14 @@ namespace winrt::TerminalApp::implementation
     // - Sets focus to the tab to the right or left the currently selected tab.
     void TerminalPage::_SelectNextTab(const bool bMoveRight)
     {
+        if (CommandPalette().Visibility() == Visibility::Visible)
+        {
+            // If the tab switcher is currently open, don't change its mode.
+            // Just select the new tab.
+            CommandPalette().SelectNextItem(bMoveRight);
+            return;
+        }
+
         const auto tabSwitchMode = _settings.GlobalSettings().TabSwitcherMode();
         const bool useInOrderTabIndex = tabSwitchMode != TabSwitcherMode::MostRecentlyUsed;
 
@@ -1250,19 +1258,10 @@ namespace winrt::TerminalApp::implementation
                 CommandPalette().SetTabActions(_mruTabActions, true);
             }
 
-            if (CommandPalette().Visibility() == Visibility::Visible)
-            {
-                // If the tab switcher is currently open, don't change its mode.
-                // Just select the new tab.
-                CommandPalette().SelectNextItem(bMoveRight);
-            }
-            else
-            {
-                // Otherwise, set up the tab switcher in the selected mode, with
-                // the given ordering, and make it visible.
-                CommandPalette().EnableTabSwitcherMode(false, newTabIndex);
-                CommandPalette().Visibility(Visibility::Visible);
-            }
+            // Otherwise, set up the tab switcher in the selected mode, with
+            // the given ordering, and make it visible.
+            CommandPalette().EnableTabSwitcherMode(false, newTabIndex);
+            CommandPalette().Visibility(Visibility::Visible);
         }
         else if (auto index{ _GetFocusedTabIndex() })
         {

src/cascadia/TerminalSettingsModel/GlobalAppSettings.h

@@ -81,7 +81,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         GETSET_SETTING(bool, DebugFeaturesEnabled); // default value set in constructor
         GETSET_SETTING(bool, StartOnUserLogin, false);
         GETSET_SETTING(bool, AlwaysOnTop, false);
-        GETSET_SETTING(Model::TabSwitcherMode, TabSwitcherMode, Model::TabSwitcherMode::MostRecentlyUsed);
+        GETSET_SETTING(Model::TabSwitcherMode, TabSwitcherMode, Model::TabSwitcherMode::InOrder);
         GETSET_SETTING(bool, DisableAnimations, false);
 
     private:

src/cascadia/TerminalSettingsModel/Profile.h

@@ -96,7 +96,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
 
         GETSET_SETTING(hstring, BackgroundImagePath);
         GETSET_SETTING(double, BackgroundImageOpacity, 1.0);
-        GETSET_SETTING(Windows::UI::Xaml::Media::Stretch, BackgroundImageStretchMode, Windows::UI::Xaml::Media::Stretch::Fill);
+        GETSET_SETTING(Windows::UI::Xaml::Media::Stretch, BackgroundImageStretchMode, Windows::UI::Xaml::Media::Stretch::UniformToFill);
 
         GETSET_SETTING(Microsoft::Terminal::TerminalControl::TextAntialiasingMode, AntialiasingMode, Microsoft::Terminal::TerminalControl::TextAntialiasingMode::Grayscale);
         GETSET_SETTING(bool, RetroTerminalEffect, false);

src/cascadia/TerminalSettingsModel/defaults.json

@@ -18,7 +18,7 @@
     "showTabsInTitlebar": true,
     "showTerminalTitleInTitlebar": true,
     "tabWidthMode": "equal",
-    "useTabSwitcher": "mru",
+    "tabSwitcherMode": "inOrder",
 
     // Miscellaneous
     "confirmCloseAllTabs": true,