Disable being able to set the automatic adjustment of indistinguishable text

src/cascadia/TerminalCore/Terminal.cpp

@@ -50,8 +50,7 @@ Terminal::Terminal() :
     _taskbarState{ 0 },
     _taskbarProgress{ 0 },
     _trimBlockSelection{ false },
-    _intenseIsBright{ true },
-    _adjustIndistinguishableColors{ true }
+    _intenseIsBright{ true }
 {
     auto dispatch = std::make_unique<TerminalDispatch>(*this);
     auto engine = std::make_unique<OutputStateMachineEngine>(std::move(dispatch));
@@ -198,7 +197,7 @@ void Terminal::UpdateAppearance(const ICoreAppearance& appearance)
     {
         _colorTable.at(i) = til::color{ appearance.GetColorTableEntry(i) };
     }
-    if (_adjustIndistinguishableColors)
+    if (_adjustIndistinguishableColors && Feature_AdjustIndistinguishableText::IsEnabled())
     {
         _MakeAdjustedColorArray();
     }
@@ -1356,7 +1355,7 @@ void Terminal::ApplyScheme(const Scheme& colorScheme)
 
     _colorTable.at(TextColor::CURSOR_COLOR) = til::color{ colorScheme.CursorColor };
 
-    if (_adjustIndistinguishableColors)
+    if (_adjustIndistinguishableColors && Feature_AdjustIndistinguishableText::IsEnabled())
     {
         _MakeAdjustedColorArray();
     }

src/cascadia/TerminalCore/terminalrenderdata.cpp

@@ -51,7 +51,7 @@ std::pair<COLORREF, COLORREF> Terminal::GetAttributeColors(const TextAttribute&
 
     // We want to nudge the foreground color to make it more perceivable only for the
     // default color pairs within the color table
-    if (_adjustIndistinguishableColors &&
+    if (_adjustIndistinguishableColors && Feature_AdjustIndistinguishableText::IsEnabled() &&
         !(attr.IsFaint() || (attr.IsBlinking() && _blinkingState.IsBlinkingFaint())) &&
         (fgTextColor.IsDefault() || fgTextColor.IsLegacy()) &&
         (bgTextColor.IsDefault() || bgTextColor.IsLegacy()))

src/cascadia/TerminalSettingsEditor/Appearances.cpp

@@ -136,6 +136,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         INITIALIZE_BINDABLE_ENUM_SETTING(IntenseTextStyle, IntenseTextStyle, winrt::Microsoft::Terminal::Settings::Model::IntenseStyle, L"Appearance_IntenseTextStyle", L"Content");
     }
 
+    bool Appearances::ShowIndistinguishableColorsItem() const noexcept
+    {
+        return Feature_AdjustIndistinguishableText::IsEnabled();
+    }
+
     // Method Description:
     // - Searches through our list of monospace fonts to determine if the settings model's current font face is a monospace font
     bool Appearances::UsingMonospaceFont() const noexcept

src/cascadia/TerminalSettingsEditor/Appearances.h

@@ -106,6 +106,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     public:
         Appearances();
 
+        bool ShowIndistinguishableColorsItem() const noexcept;
+
         // font face
         Windows::Foundation::IInspectable CurrentFontFace() const;
 

src/cascadia/TerminalSettingsEditor/Appearances.idl

@@ -56,6 +56,8 @@ namespace Microsoft.Terminal.Settings.Editor
         ProfileViewModel SourceProfile;
         static Windows.UI.Xaml.DependencyProperty AppearanceProperty { get; };
 
+        Boolean ShowIndistinguishableColorsItem { get; };
+
         Boolean UsingMonospaceFont { get; };
         Boolean ShowAllFonts;
 

src/cascadia/TerminalSettingsEditor/Appearances.xaml

@@ -158,7 +158,8 @@
             <local:SettingContainer x:Uid="Profile_AdjustIndistinguishableColors"
                                     ClearSettingValue="{x:Bind Appearance.ClearAdjustIndistinguishableColors}"
                                     HasSettingValue="{x:Bind Appearance.HasAdjustIndistinguishableColors, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Appearance.AdjustIndistinguishableColorsOverrideSource, Mode=OneWay}">
+                                    SettingOverrideSource="{x:Bind Appearance.AdjustIndistinguishableColorsOverrideSource, Mode=OneWay}"
+                                    Visibility="{x:Bind ShowIndistinguishableColorsItem}">
                 <ToggleSwitch IsOn="{x:Bind Appearance.AdjustIndistinguishableColors, Mode=TwoWay}" />
             </local:SettingContainer>
         </StackPanel>

src/cascadia/TerminalSettingsModel/MTSMSettings.h

@@ -96,4 +96,4 @@ Author(s):
     X(hstring, ColorSchemeName, "colorScheme", L"Campbell")                                                                                                        \
     X(hstring, BackgroundImagePath, "backgroundImage")                                                                                                             \
     X(Model::IntenseStyle, IntenseTextStyle, "intenseTextStyle", Model::IntenseStyle::Bright)                                                                      \
-    X(bool, AdjustIndistinguishableColors, "adjustIndistinguishableColors", true)
+    X(bool, AdjustIndistinguishableColors, "adjustIndistinguishableColors", false)

src/features.xml

@@ -82,4 +82,10 @@
             <brandingToken>WindowsInbox</brandingToken>
         </alwaysDisabledBrandingTokens>
     </feature>
+
+    <feature>
+        <name>Feature_AdjustIndistinguishableText</name>
+        <description>If enabled, the foreground color will, when necessary, be automatically adjusted to make it more visible.</description>
+        <stage>AlwaysDisabled</stage>
+    </feature>
 </featureStaging>