From 2054df31b97b8ab4b897f380053389542f2432fe Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 12 Jan 2021 20:49:48 +0800
Subject: [PATCH] fix<WorkingCopy>: force trigger DataGrid layout update to fix
 bad column with issue

---
 src/UI/WorkingCopy.xaml    | 4 ++--
 src/UI/WorkingCopy.xaml.cs | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/UI/WorkingCopy.xaml b/src/UI/WorkingCopy.xaml
index 98d588d8..2636c538 100644
--- a/src/UI/WorkingCopy.xaml
+++ b/src/UI/WorkingCopy.xaml
@@ -231,7 +231,7 @@
                 <TreeView
                     Grid.Row="1" 
                     x:Name="stageTree"
-                    ItemsSource="{Binding ElementName=me, Path=StagedTreeData, IsAsync=True}"
+                    ItemsSource="{Binding ElementName=me, Path=StagedTreeData, IsAsync=False}"
                     Visibility="{Binding Source={x:Static source:App.Setting}, Path=UI.StagedFileDisplayMode, Converter={StaticResource FilesDisplayModeToTree}}"
                     Background="{StaticResource Brush.Contents}"
                     FontFamily="Consolas" 
@@ -286,7 +286,7 @@
                 <DataGrid
                     Grid.Row="1"
                     x:Name="stageList"                    
-                    ItemsSource="{Binding ElementName=me, Path=StagedListData, IsAsync=True}"
+                    ItemsSource="{Binding ElementName=me, Path=StagedListData, IsAsync=False}"
                     RowHeight="24"
                     Visibility="{Binding Source={x:Static source:App.Setting}, Path=UI.StagedFileDisplayMode, Converter={StaticResource FilesDisplayModeToList}}"
                     SelectionChanged="StagedListSelectionChanged"
diff --git a/src/UI/WorkingCopy.xaml.cs b/src/UI/WorkingCopy.xaml.cs
index 58982c54..51756ee8 100644
--- a/src/UI/WorkingCopy.xaml.cs
+++ b/src/UI/WorkingCopy.xaml.cs
@@ -114,6 +114,12 @@ namespace SourceGit.UI {
                 UpdateData(unstaged, UnstagedListData, UnstagedTreeData);
                 UpdateData(staged, StagedListData, StagedTreeData);
 
+                // Force trigger UpdateLayout for DataGrid.
+                unstagedList.Columns.Add(new DataGridTextColumn());
+                unstagedList.Columns.RemoveAt(unstagedList.Columns.Count - 1);
+                stageList.Columns.Add(new DataGridTextColumn());
+                stageList.Columns.RemoveAt(stageList.Columns.Count - 1);
+
                 var current = Repo.CurrentBranch();
                 if (current != null && !string.IsNullOrEmpty(current.Upstream) && chkAmend.IsChecked != true) {
                     btnCommitAndPush.Visibility = Visibility.Visible;