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

fix<DiffViewer>: clear all editor grid lines before redraw

Browse source
This commit is contained in:
leo 2020-12-15 13:44:32 +08:00
parent 8ac28ff9e5
commit ed5ebfaee7
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/UI/DiffViewer.xaml.cs
View file

@ -91,7 +91,8 @@ namespace SourceGit.UI {
sizeChange.Visibility = Visibility.Collapsed; sizeChange.Visibility = Visibility.Collapsed;
noChange.Visibility = Visibility.Collapsed; noChange.Visibility = Visibility.Collapsed;
foreach (var editor in editors) editorContainer.Children.Remove(editor); editorContainer.Children.Clear();
editorLines.Children.Clear();
editors.Clear(); editors.Clear();
editorLines.Children.Clear(); editorLines.Children.Clear();
@ -193,6 +194,7 @@ namespace SourceGit.UI {
editorContainer.Children.Add(editor); editorContainer.Children.Add(editor);
editors.Add(editor); editors.Add(editor);
editorLines.ColumnDefinitions.Clear();
editorLines.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(lineNumberWidth) }); editorLines.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(lineNumberWidth) });
editorLines.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(lineNumberWidth) }); editorLines.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(lineNumberWidth) });
@ -270,6 +272,7 @@ namespace SourceGit.UI {
editors.Add(oldEditor); editors.Add(oldEditor);
editors.Add(newEditor); editors.Add(newEditor);
editorLines.ColumnDefinitions.Clear();
editorLines.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(lineNumberWidth) }); editorLines.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(lineNumberWidth) });
editorLines.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(1, GridUnitType.Star) }); editorLines.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(1, GridUnitType.Star) });
editorLines.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(lineNumberWidth) }); editorLines.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(lineNumberWidth) });
@ -608,7 +611,10 @@ namespace SourceGit.UI {
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
private void ChangeDiffMode(object sender, RoutedEventArgs e) { private void ChangeDiffMode(object sender, RoutedEventArgs e) {
foreach (var editor in editors) editorContainer.Children.Remove(editor); if (!IsLoaded) return;
editorContainer.Children.Clear();
editorLines.Children.Clear();
editors.Clear(); editors.Clear();
SetTextChange(); SetTextChange();