Repository: microsoft/terminal (language: cpp)

Issue:
Velocity Cleanup: Feature_AdjustIndistinguishableText
This feature's stage has switched to `AlwaysEnabled` in `main`.


Discussion / hints:

Fix patch:
diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.cpp b/src/cascadia/TerminalSettingsEditor/Appearances.cpp
index 49d3082350e..4b4b5a5a361 100644
--- a/src/cascadia/TerminalSettingsEditor/Appearances.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Appearances.cpp
@@ -148,11 +148,6 @@ 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
diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.h b/src/cascadia/TerminalSettingsEditor/Appearances.h
index 1eec30f57af..207a1f8846a 100644
--- a/src/cascadia/TerminalSettingsEditor/Appearances.h
+++ b/src/cascadia/TerminalSettingsEditor/Appearances.h
@@ -106,8 +106,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     public:
         Appearances();
 
-        bool ShowIndistinguishableColorsItem() const noexcept;
-
         // font face
         Windows::Foundation::IInspectable CurrentFontFace() const;
 
diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.idl b/src/cascadia/TerminalSettingsEditor/Appearances.idl
index 39068ee8254..303e94b0d4a 100644
--- a/src/cascadia/TerminalSettingsEditor/Appearances.idl
+++ b/src/cascadia/TerminalSettingsEditor/Appearances.idl
@@ -56,8 +56,6 @@ namespace Microsoft.Terminal.Settings.Editor
         ProfileViewModel SourceProfile;
         static Windows.UI.Xaml.DependencyProperty AppearanceProperty { get; };
 
-        Boolean ShowIndistinguishableColorsItem { get; };
-
         Boolean UsingMonospaceFont { get; };
         Boolean ShowAllFonts;
 
diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.xaml b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
index 2e348581216..8a6a5d45aa9 100644
--- a/src/cascadia/TerminalSettingsEditor/Appearances.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
@@ -156,8 +156,7 @@
             <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}"
-                                    Visibility="{x:Bind ShowIndistinguishableColorsItem}">
+                                    SettingOverrideSource="{x:Bind Appearance.AdjustIndistinguishableColorsOverrideSource, Mode=OneWay}">
                 <ComboBox AutomationProperties.AccessibilityView="Content"
                           ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                           ItemsSource="{x:Bind AdjustIndistinguishableColorsList, Mode=OneWay}"
diff --git a/src/features.xml b/src/features.xml
index beab19b0f2d..9d3c36cf7d3 100644
--- a/src/features.xml
+++ b/src/features.xml
@@ -90,6 +90,9 @@
         <name>Feature_AdjustIndistinguishableText</name>
         <description>If enabled, the foreground color will, when necessary, be automatically adjusted to make it more visible.</description>
         <stage>AlwaysEnabled</stage>
+        <alwaysDisabledBrandingTokens>
+            <brandingToken>WindowsInbox</brandingToken>
+        </alwaysDisabledBrandingTokens>
     </feature>
 
     <feature>


Test patch: