Merge remote-tracking branch 'origin/main' into feature/llm

# Conflicts:
#	src/cascadia/TerminalApp/TerminalPage.cpp

Author: DHowett

build/config/template.appinstaller

@@ -14,21 +14,21 @@
     <Package
       Name="Microsoft.UI.Xaml.2.8"
       Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
-      Version="8.2305.5001.0"
+      Version="8.2306.22001.0"
       ProcessorArchitecture="x64"
-      Uri="https://github.com/microsoft/microsoft-ui-xaml/releases/download/v2.8.4/Microsoft.UI.Xaml.2.8.x64.appx" />
+      Uri="https://github.com/microsoft/microsoft-ui-xaml/releases/download/v2.8.5/Microsoft.UI.Xaml.2.8.x64.appx" />
     <Package
       Name="Microsoft.UI.Xaml.2.8"
       Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
-      Version="8.2305.5001.0"
+      Version="8.2306.22001.0"
       ProcessorArchitecture="x86"
-      Uri="https://github.com/microsoft/microsoft-ui-xaml/releases/download/v2.8.4/Microsoft.UI.Xaml.2.8.x86.appx" />
+      Uri="https://github.com/microsoft/microsoft-ui-xaml/releases/download/v2.8.5/Microsoft.UI.Xaml.2.8.x86.appx" />
     <Package
       Name="Microsoft.UI.Xaml.2.8"
       Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
-      Version="8.2305.5001.0"
+      Version="8.2306.22001.0"
       ProcessorArchitecture="arm64"
-      Uri="https://github.com/microsoft/microsoft-ui-xaml/releases/download/v2.8.4/Microsoft.UI.Xaml.2.8.arm64.appx" />
+      Uri="https://github.com/microsoft/microsoft-ui-xaml/releases/download/v2.8.5/Microsoft.UI.Xaml.2.8.arm64.appx" />
   </Dependencies>
 
   <UpdateSettings>

src/cascadia/TerminalApp/ColorHelper.cpp

@@ -8,8 +8,8 @@
 #include "SettingsPaneContent.h"
 #include "Tab.g.cpp"
 #include "Utils.h"
-#include "ColorHelper.h"
 #include "AppLogic.h"
+#include "../../types/inc/ColorFix.hpp"
 
 using namespace winrt;
 using namespace winrt::Windows::UI::Xaml;
@@ -2275,11 +2275,13 @@ namespace winrt::TerminalApp::implementation
     // the background color
     // - This method should only be called on the UI thread.
     // Arguments:
-    // - color: the color the user picked for their tab
+    // - uiColor: the color the user picked for their tab
     // Return Value:
     // - <none>
-    void Tab::_ApplyTabColorOnUIThread(const winrt::Windows::UI::Color& color)
+    void Tab::_ApplyTabColorOnUIThread(const winrt::Windows::UI::Color& uiColor)
     {
+        constexpr auto lightnessThreshold = 0.6f;
+        const til::color color{ uiColor };
         Media::SolidColorBrush selectedTabBrush{};
         Media::SolidColorBrush deselectedTabBrush{};
         Media::SolidColorBrush fontBrush{};
@@ -2292,7 +2294,7 @@ namespace winrt::TerminalApp::implementation
         // calculate the luminance of the current color and select a font
         // color based on that
         // see https://www.w3.org/TR/WCAG20/#relativeluminancedef
-        if (TerminalApp::ColorHelper::IsBrightColor(color))
+        if (ColorFix::GetLightness(color) >= lightnessThreshold)
         {
             auto subtleFillColorSecondary = winrt::Windows::UI::Colors::Black();
             subtleFillColorSecondary.A = 0x09;
@@ -2312,8 +2314,8 @@ namespace winrt::TerminalApp::implementation
         }
 
         // The tab font should be based on the evaluated appearance of the tab color layered on tab row.
-        const auto layeredTabColor = til::color{ color }.layer_over(_tabRowColor);
-        if (TerminalApp::ColorHelper::IsBrightColor(layeredTabColor))
+        const auto layeredTabColor = color.layer_over(_tabRowColor);
+        if (ColorFix::GetLightness(layeredTabColor) >= lightnessThreshold)
         {
             fontBrush.Color(winrt::Windows::UI::Colors::Black());
             auto secondaryFontColor = winrt::Windows::UI::Colors::Black();
@@ -2333,8 +2335,7 @@ namespace winrt::TerminalApp::implementation
         selectedTabBrush.Color(color);
 
         // Start with the current tab color, set to Opacity=.3
-        til::color deselectedTabColor{ color };
-        deselectedTabColor = deselectedTabColor.with_alpha(77); // 255 * .3 = 77
+        auto deselectedTabColor = color.with_alpha(77); // 255 * .3 = 77
 
         // If we DON'T have a color set from the color picker, or the profile's
         // tabColor, but we do have a unfocused color in the theme, use the
@@ -2376,7 +2377,7 @@ namespace winrt::TerminalApp::implementation
         // We don't want that to result in white text on a white tab row for
         // inactive tabs.
         const auto deselectedActualColor = deselectedTabColor.layer_over(_tabRowColor);
-        if (TerminalApp::ColorHelper::IsBrightColor(deselectedActualColor))
+        if (ColorFix::GetLightness(deselectedActualColor) >= lightnessThreshold)
         {
             deselectedFontBrush.Color(winrt::Windows::UI::Colors::Black());
         }