michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-24 20:57:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix<WorkingCopy>: force trigger DataGrid layout update to fix bad column with issue

Browse source
This commit is contained in:
leo 2021-01-12 20:49:48 +08:00
parent 57a02b1d86
commit 2054df31b9
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/UI/WorkingCopy.xaml
View file

@ -231,7 +231,7 @@
<TreeView <TreeView
Grid.Row="1" Grid.Row="1"
x:Name="stageTree" 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}}" Visibility="{Binding Source={x:Static source:App.Setting}, Path=UI.StagedFileDisplayMode, Converter={StaticResource FilesDisplayModeToTree}}"
Background="{StaticResource Brush.Contents}" Background="{StaticResource Brush.Contents}"
FontFamily="Consolas" FontFamily="Consolas"
@ -286,7 +286,7 @@
<DataGrid <DataGrid
Grid.Row="1" Grid.Row="1"
x:Name="stageList" x:Name="stageList"
ItemsSource="{Binding ElementName=me, Path=StagedListData, IsAsync=True}" ItemsSource="{Binding ElementName=me, Path=StagedListData, IsAsync=False}"
RowHeight="24" RowHeight="24"
Visibility="{Binding Source={x:Static source:App.Setting}, Path=UI.StagedFileDisplayMode, Converter={StaticResource FilesDisplayModeToList}}" Visibility="{Binding Source={x:Static source:App.Setting}, Path=UI.StagedFileDisplayMode, Converter={StaticResource FilesDisplayModeToList}}"
SelectionChanged="StagedListSelectionChanged" SelectionChanged="StagedListSelectionChanged"

6
src/UI/WorkingCopy.xaml.cs
View file

@ -114,6 +114,12 @@ namespace SourceGit.UI {
UpdateData(unstaged, UnstagedListData, UnstagedTreeData); UpdateData(unstaged, UnstagedListData, UnstagedTreeData);
UpdateData(staged, StagedListData, StagedTreeData); 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(); var current = Repo.CurrentBranch();
if (current != null && !string.IsNullOrEmpty(current.Upstream) && chkAmend.IsChecked != true) { if (current != null && !string.IsNullOrEmpty(current.Upstream) && chkAmend.IsChecked != true) {
btnCommitAndPush.Visibility = Visibility.Visible; btnCommitAndPush.Visibility = Visibility.Visible;