From d68bc5b26f1cf644c5d0a326fea956f006577dd2 Mon Sep 17 00:00:00 2001
From: hishitetsu <66369541+hishitetsu@users.noreply.github.com>
Date: Tue, 20 Jun 2023 09:15:32 +0900
Subject: [PATCH 1/2] Fixed crash

---
 src/Files.App/Converters/Converters.cs        |  27 ++++
 .../UserControls/StatusBarControl.xaml        | 148 +++++++++---------
 2 files changed, 104 insertions(+), 71 deletions(-)

diff --git a/src/Files.App/Converters/Converters.cs b/src/Files.App/Converters/Converters.cs
index 9ed5866c9d76..54c4392cace4 100644
--- a/src/Files.App/Converters/Converters.cs
+++ b/src/Files.App/Converters/Converters.cs
@@ -211,4 +211,31 @@ protected override string ConvertBack(bool value, object? parameter, string? lan
 			return string.Empty;
 		}
 	}
+
+	internal sealed class NullToVisibilityCollapsedConverter : ValueConverter<object?, Visibility>
+	{
+		/// <summary>
+		/// Converts a source value to the target type.
+		/// </summary>
+		/// <param name="value"></param>
+		/// <param name="parameter"></param>
+		/// <param name="language"></param>
+		/// <returns></returns>
+		protected override Visibility Convert(object? value, object? parameter, string? language)
+		{
+			return value is null ? Visibility.Collapsed : Visibility.Visible;
+		}
+
+		/// <summary>
+		/// Converts a target value back to the source type.
+		/// </summary>
+		/// <param name="value"></param>
+		/// <param name="parameter"></param>
+		/// <param name="language"></param>
+		/// <returns></returns>
+		protected override object? ConvertBack(Visibility value, object? parameter, string? language)
+		{
+			return new NotSupportedException();
+		}
+	}
 }
diff --git a/src/Files.App/UserControls/StatusBarControl.xaml b/src/Files.App/UserControls/StatusBarControl.xaml
index 0b5b6ad36500..67e7164bc77c 100644
--- a/src/Files.App/UserControls/StatusBarControl.xaml
+++ b/src/Files.App/UserControls/StatusBarControl.xaml
@@ -14,6 +14,7 @@
 
 	<UserControl.Resources>
 		<converters:NullToTrueConverter x:Key="NullToFalseConverter" Inverse="True" />
+		<converters:NullToVisibilityCollapsedConverter x:Key="NullToVisibilityCollapsedConverter" />
 
 		<Style x:Key="Local.RadioButtonStyle" TargetType="RadioButton">
 			<Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" />
@@ -100,10 +101,11 @@
 		</Style>
 	</UserControl.Resources>
 
-	<Grid Padding="8,0" ColumnSpacing="8">
+	<Grid Padding="8,0" ColumnSpacing="4">
 		<Grid.ColumnDefinitions>
 			<ColumnDefinition />
 			<ColumnDefinition Width="Auto" />
+			<ColumnDefinition Width="Auto" />
 		</Grid.ColumnDefinitions>
 		<StackPanel
 			Grid.Column="0"
@@ -186,6 +188,7 @@
 			<!--  Pull Button  -->
 			<Button
 				x:Name="GitPullButton"
+				Grid.Column="2"
 				Height="24"
 				Padding="8,0,8,0"
 				VerticalAlignment="Center"
@@ -201,83 +204,86 @@
 					<TextBlock Text="{x:Bind DirectoryPropertiesViewModel.PullInfo, Mode=OneWay}" />
 				</StackPanel>
 			</Button>
+		</StackPanel>
 
-			<Button
-				x:Name="GitBranch"
-				Height="24"
-				Padding="8,0,8,0"
-				Background="Transparent"
-				BorderBrush="Transparent"
-				ToolTipService.ToolTip="{helpers:ResourceString Name=ManageBranches}">
-
-				<Button.Content>
-					<StackPanel Orientation="Horizontal" Spacing="8">
-						<usercontrols:OpacityIcon Style="{StaticResource ColorIconGitBranches}" />
-
-						<!--  Branch Name  -->
-						<TextBlock Text="{x:Bind DirectoryPropertiesViewModel.GitBranchDisplayName, Mode=OneWay}" />
-					</StackPanel>
-				</Button.Content>
+		<!--  Use visibility because it causes a crash to use a TwoWay x:Bind on an element that is inside an element with x:Load (#12589, #12599)  -->
+		<Button
+			x:Name="GitBranch"
+			Grid.Column="2"
+			Height="24"
+			Padding="8,0,8,0"
+			Background="Transparent"
+			BorderBrush="Transparent"
+			ToolTipService.ToolTip="{helpers:ResourceString Name=ManageBranches}"
+			Visibility="{x:Bind DirectoryPropertiesViewModel.GitBranchDisplayName, Mode=OneWay, Converter={StaticResource NullToVisibilityCollapsedConverter}}">
 
-				<Button.Flyout>
-					<Flyout x:Name="BranchesFlyout" Opening="BranchesFlyout_Opening">
-						<Grid
-							Width="300"
-							Height="340"
-							Margin="-16">
-							<Grid.RowDefinitions>
-								<RowDefinition Height="Auto" />
-								<RowDefinition Height="*" />
-							</Grid.RowDefinitions>
+			<Button.Content>
+				<StackPanel Orientation="Horizontal" Spacing="8">
+					<usercontrols:OpacityIcon Style="{StaticResource ColorIconGitBranches}" />
 
-							<!--  Header  -->
-							<Grid
-								Grid.Row="0"
-								Padding="4,8,8,8"
-								Background="{ThemeResource AcrylicBackgroundFillColorDefaultBrush}"
-								BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-								BorderThickness="0,0,0,1">
+					<!--  Branch Name  -->
+					<TextBlock Text="{x:Bind DirectoryPropertiesViewModel.GitBranchDisplayName, Mode=OneWay}" />
+				</StackPanel>
+			</Button.Content>
 
-								<!--  Locals and Remotes  -->
-								<StackPanel
-									Grid.Row="1"
-									HorizontalAlignment="Left"
-									VerticalAlignment="Center"
-									Orientation="Horizontal">
-									<RadioButton
-										Content="{helpers:ResourceString Name=Locals}"
-										IsChecked="{x:Bind DirectoryPropertiesViewModel.ShowLocals, Mode=TwoWay}"
-										Style="{StaticResource Local.RadioButtonStyle}" />
-									<RadioButton Content="{helpers:ResourceString Name=Remotes}" Style="{StaticResource Local.RadioButtonStyle}" />
-								</StackPanel>
+			<Button.Flyout>
+				<Flyout x:Name="BranchesFlyout" Opening="BranchesFlyout_Opening">
+					<Grid
+						Width="300"
+						Height="340"
+						Margin="-16">
+						<Grid.RowDefinitions>
+							<RowDefinition Height="Auto" />
+							<RowDefinition Height="*" />
+						</Grid.RowDefinitions>
 
-								<!--  New Branch Button  -->
-								<Button
-									x:Name="NewBranchButton"
-									Height="24"
-									Padding="8,0"
-									HorizontalAlignment="Right"
-									Command="{x:Bind DirectoryPropertiesViewModel.NewBranchCommand, Mode=OneWay}"
-									Content="{helpers:ResourceString Name=CreateBranch}"
-									FontSize="12"
-									ToolTipService.ToolTip="{helpers:ResourceString Name=CreateBranch}" />
-							</Grid>
+						<!--  Header  -->
+						<Grid
+							Grid.Row="0"
+							Padding="4,8,8,8"
+							Background="{ThemeResource AcrylicBackgroundFillColorDefaultBrush}"
+							BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+							BorderThickness="0,0,0,1">
 
-							<!--  Branches List  -->
-							<ListView
-								x:Name="BranchesList"
+							<!--  Locals and Remotes  -->
+							<StackPanel
 								Grid.Row="1"
-								Padding="4"
-								Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-								IsItemClickEnabled="True"
-								ItemClick="BranchesList_ItemClick"
-								ItemsSource="{x:Bind DirectoryPropertiesViewModel.BranchesNames, Mode=OneWay}"
-								SelectedIndex="{x:Bind DirectoryPropertiesViewModel.SelectedBranchIndex, Mode=TwoWay}"
-								SelectionMode="Single" />
+								HorizontalAlignment="Left"
+								VerticalAlignment="Center"
+								Orientation="Horizontal">
+								<RadioButton
+									Content="{helpers:ResourceString Name=Locals}"
+									IsChecked="{x:Bind DirectoryPropertiesViewModel.ShowLocals, Mode=TwoWay}"
+									Style="{StaticResource Local.RadioButtonStyle}" />
+								<RadioButton Content="{helpers:ResourceString Name=Remotes}" Style="{StaticResource Local.RadioButtonStyle}" />
+							</StackPanel>
+
+							<!--  New Branch Button  -->
+							<Button
+								x:Name="NewBranchButton"
+								Height="24"
+								Padding="8,0"
+								HorizontalAlignment="Right"
+								Command="{x:Bind DirectoryPropertiesViewModel.NewBranchCommand, Mode=OneWay}"
+								Content="{helpers:ResourceString Name=CreateBranch}"
+								FontSize="12"
+								ToolTipService.ToolTip="{helpers:ResourceString Name=CreateBranch}" />
 						</Grid>
-					</Flyout>
-				</Button.Flyout>
-			</Button>
-		</StackPanel>
+
+						<!--  Branches List  -->
+						<ListView
+							x:Name="BranchesList"
+							Grid.Row="1"
+							Padding="4"
+							Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+							IsItemClickEnabled="True"
+							ItemClick="BranchesList_ItemClick"
+							ItemsSource="{x:Bind DirectoryPropertiesViewModel.BranchesNames, Mode=OneWay}"
+							SelectedIndex="{x:Bind DirectoryPropertiesViewModel.SelectedBranchIndex, Mode=TwoWay}"
+							SelectionMode="Single" />
+					</Grid>
+				</Flyout>
+			</Button.Flyout>
+		</Button>
 	</Grid>
 </UserControl>

From 89ac6437a765ade3a4b71dd8ef7d6e79a6511ab4 Mon Sep 17 00:00:00 2001
From: hishitetsu <66369541+hishitetsu@users.noreply.github.com>
Date: Tue, 20 Jun 2023 09:17:51 +0900
Subject: [PATCH 2/2] Update StatusBarControl.xaml

---
 src/Files.App/UserControls/StatusBarControl.xaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Files.App/UserControls/StatusBarControl.xaml b/src/Files.App/UserControls/StatusBarControl.xaml
index 67e7164bc77c..f5e51501dea1 100644
--- a/src/Files.App/UserControls/StatusBarControl.xaml
+++ b/src/Files.App/UserControls/StatusBarControl.xaml
@@ -188,7 +188,6 @@
 			<!--  Pull Button  -->
 			<Button
 				x:Name="GitPullButton"
-				Grid.Column="2"
 				Height="24"
 				Padding="8,0,8,0"
 				VerticalAlignment="Center"