From 086d5a64e01cec22bcf4a0d73e43176d9449565d Mon Sep 17 00:00:00 2001
From: Jonathan Meier <jonathan.meier@outlook.com>
Date: Sun, 9 Oct 2022 14:30:46 +0200
Subject: [PATCH] Fix clipped progress ring in tab when tab title is too long

---
 src/cascadia/TerminalApp/TabHeaderControl.xaml | 7 +------
 src/cascadia/TerminalApp/TerminalTab.cpp       | 3 ++-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/cascadia/TerminalApp/TabHeaderControl.xaml b/src/cascadia/TerminalApp/TabHeaderControl.xaml
index abfd7e5a254..80889eabb8c 100644
--- a/src/cascadia/TerminalApp/TabHeaderControl.xaml
+++ b/src/cascadia/TerminalApp/TabHeaderControl.xaml
@@ -20,16 +20,11 @@
                           Height="15"
                           MinWidth="0"
                           MinHeight="0"
-                          Margin="-7.5,0,8,0"
+                          Margin="3,0,8,0"
                           IsActive="{x:Bind TabStatus.IsProgressRingActive, Mode=OneWay}"
                           IsIndeterminate="{x:Bind TabStatus.IsProgressRingIndeterminate, Mode=OneWay}"
                           Visibility="{x:Bind TabStatus.IsProgressRingActive, Mode=OneWay}"
                           Value="{x:Bind TabStatus.ProgressValue, Mode=OneWay}" />
-        <!--
-            We want the progress ring to 'replace' the tab icon, but we don't have control
-            over the tab icon here (the tab view item does) - so we hide the tab icon there
-            and use a negative margin for the progress ring here to put it where the icon would be
-        -->
         <FontIcon x:Name="HeaderBellIndicator"
                   Margin="0,0,8,0"
                   FontFamily="{ThemeResource SymbolThemeFontFamily}"
diff --git a/src/cascadia/TerminalApp/TerminalTab.cpp b/src/cascadia/TerminalApp/TerminalTab.cpp
index 292ae7c410f..8cd4ae86acd 100644
--- a/src/cascadia/TerminalApp/TerminalTab.cpp
+++ b/src/cascadia/TerminalApp/TerminalTab.cpp
@@ -15,6 +15,7 @@ using namespace winrt::Windows::UI::Xaml;
 using namespace winrt::Windows::UI::Core;
 using namespace winrt::Microsoft::Terminal::Control;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
+using namespace winrt::Microsoft::UI::Xaml::Controls;
 using namespace winrt::Windows::System;
 
 namespace winrt
@@ -316,7 +317,7 @@ namespace winrt::TerminalApp::implementation
                 if (hide)
                 {
                     Icon({});
-                    TabViewItem().IconSource(IconPathConverter::IconSourceMUX({}));
+                    TabViewItem().IconSource(IconSource{ nullptr });
                 }
                 else
                 {