From fb7831a4bb17a5d56e18edf0957e1d860ac4082f Mon Sep 17 00:00:00 2001
From: Steve Cadwallader <steve.cadwallader@gmail.com>
Date: Sat, 14 Jan 2023 14:06:45 -0500
Subject: [PATCH] Multi-bind on IsVisibile to bypass a WPF leak issue

---
 CodeMaidShared/CodeMaidShared.projitems       |  1 +
 .../UI/Converters/BooleanAndConverter.cs      | 67 +++++++++++++++++++
 .../BuildProgress/BuildProgressView.xaml      | 21 +++---
 3 files changed, 81 insertions(+), 8 deletions(-)
 create mode 100644 CodeMaidShared/UI/Converters/BooleanAndConverter.cs

diff --git a/CodeMaidShared/CodeMaidShared.projitems b/CodeMaidShared/CodeMaidShared.projitems
index 8fa3bac20..a9033ee27 100644
--- a/CodeMaidShared/CodeMaidShared.projitems
+++ b/CodeMaidShared/CodeMaidShared.projitems
@@ -159,6 +159,7 @@
       <AutoGen>True</AutoGen>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)UI\Bindable.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\Converters\BooleanAndConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\Converters\BooleanInverseConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\Converters\BooleanToVisibilityConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\Converters\CodeItemParentHighestComplexityConverter.cs" />
diff --git a/CodeMaidShared/UI/Converters/BooleanAndConverter.cs b/CodeMaidShared/UI/Converters/BooleanAndConverter.cs
new file mode 100644
index 000000000..d1aef97a8
--- /dev/null
+++ b/CodeMaidShared/UI/Converters/BooleanAndConverter.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Globalization;
+using System.Linq;
+using System.Windows.Data;
+
+namespace SteveCadwallader.CodeMaid.UI.Converters
+{
+    /// <summary>
+    /// A converter that performs a logical AND on all values.
+    /// </summary>
+    public class BooleanAndConverter : IMultiValueConverter
+    {
+        /// <summary>
+        /// The default <see cref="BooleanAndConverter" />.
+        /// </summary>
+        public static BooleanAndConverter Default = new BooleanAndConverter();
+
+        /// <summary>
+        /// Converts source values to a value for the binding target. The data binding engine calls
+        /// this method when it propagates the values from source bindings to the binding target.
+        /// </summary>
+        /// <param name="values">
+        /// The array of values that the source bindings in the <see
+        /// cref="T:System.Windows.Data.MultiBinding" /> produces. The value <see
+        /// cref="F:System.Windows.DependencyProperty.UnsetValue" /> indicates that the source
+        /// binding has no value to provide for conversion.
+        /// </param>
+        /// <param name="targetType">The type of the binding target property.</param>
+        /// <param name="parameter">The converter parameter to use.</param>
+        /// <param name="culture">The culture to use in the converter.</param>
+        /// <returns>
+        /// A converted value.If the method returns null, the valid null value is used.A return
+        /// value of <see cref="T:System.Windows.DependencyProperty" />.<see
+        /// cref="F:System.Windows.DependencyProperty.UnsetValue" /> indicates that the converter
+        /// did not produce a value, and that the binding will use the <see
+        /// cref="P:System.Windows.Data.BindingBase.FallbackValue" /> if it is available, or else
+        /// will use the default value.A return value of <see cref="T:System.Windows.Data.Binding"
+        /// />.<see cref="F:System.Windows.Data.Binding.DoNothing" /> indicates that the binding
+        /// does not transfer the value or use the <see
+        /// cref="P:System.Windows.Data.BindingBase.FallbackValue" /> or the default value.
+        /// </returns>
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (values == null || values.Length < 1) return null;
+
+            return values.All(x => (bool)x);
+        }
+
+        /// <summary>
+        /// Converts a binding target value to the source binding values.
+        /// </summary>
+        /// <param name="value">The value that the binding target produces.</param>
+        /// <param name="targetTypes">
+        /// The array of types to convert to. The array length indicates the number and types of
+        /// values that are suggested for the method to return.
+        /// </param>
+        /// <param name="parameter">The converter parameter to use.</param>
+        /// <param name="culture">The culture to use in the converter.</param>
+        /// <returns>
+        /// An array of values that have been converted from the target value back to the source values.
+        /// </returns>
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/CodeMaidShared/UI/ToolWindows/BuildProgress/BuildProgressView.xaml b/CodeMaidShared/UI/ToolWindows/BuildProgress/BuildProgressView.xaml
index aa6efaa4c..8d60c732f 100644
--- a/CodeMaidShared/UI/ToolWindows/BuildProgress/BuildProgressView.xaml
+++ b/CodeMaidShared/UI/ToolWindows/BuildProgress/BuildProgressView.xaml
@@ -1,10 +1,10 @@
 <UserControl x:Class="SteveCadwallader.CodeMaid.UI.ToolWindows.BuildProgress.BuildProgressView"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:cnv="clr-namespace:SteveCadwallader.CodeMaid.UI.Converters"
-        xmlns:vsfx="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.15.0"
-        xmlns:p="clr-namespace:SteveCadwallader.CodeMaid.Properties"
-        Background="{DynamicResource {x:Static vsfx:VsBrushes.ToolWindowBackgroundKey}}"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:cnv="clr-namespace:SteveCadwallader.CodeMaid.UI.Converters"
+             xmlns:vsfx="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.15.0"
+             xmlns:p="clr-namespace:SteveCadwallader.CodeMaid.Properties"
+             Background="{DynamicResource {x:Static vsfx:VsBrushes.ToolWindowBackgroundKey}}"
         Foreground="{DynamicResource {x:Static vsfx:VsBrushes.ToolWindowTextKey}}">
     <Grid VerticalAlignment="Bottom">
         <Grid.ColumnDefinitions>
@@ -13,8 +13,13 @@
             <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
 
-        <ProgressBar IsIndeterminate="{Binding IsProgressIndeterminate}" Maximum="1"
-                Value="{Binding ProgressPercentage}">
+        <ProgressBar Maximum="1" Value="{Binding ProgressPercentage}">
+            <ProgressBar.IsIndeterminate>
+                <MultiBinding Converter="{x:Static cnv:BooleanAndConverter.Default}">
+                    <Binding Path="IsProgressIndeterminate" />
+                    <Binding Path="IsVisible" RelativeSource="{RelativeSource Self}" />
+                </MultiBinding>
+            </ProgressBar.IsIndeterminate>
             <ProgressBar.Style>
                 <Style TargetType="{x:Type ProgressBar}">
                     <Style.Triggers>