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: MakeSelection should not use UseSideBySideDiff directly

Browse source
This commit is contained in:
leo 2024-07-18 11:26:47 +08:00
parent 14469b1399
commit e64026d44c
No known key found for this signature in database
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Views/TextDiffView.axaml.cs
View file

@ -1162,7 +1162,7 @@ namespace SourceGit.Views
if (UseSideBySideDiff) if (UseSideBySideDiff)
(startLine, endLine) = GetUnifiedRange(diff, startLine, endLine, isOldSide); (startLine, endLine) = GetUnifiedRange(diff, startLine, endLine, isOldSide);
var selection = MakeSelection(diff, startLine, endLine, isOldSide); var selection = MakeSelection(diff, startLine, endLine, !UseSideBySideDiff, isOldSide);
if (!selection.HasChanges) if (!selection.HasChanges)
return; return;
@ -1429,7 +1429,7 @@ namespace SourceGit.Views
if (change == null) if (change == null)
return; return;
var selection = MakeSelection(diff, chunk.StartIdx + 1, chunk.EndIdx + 1, false); var selection = MakeSelection(diff, chunk.StartIdx + 1, chunk.EndIdx + 1, true, false);
if (!selection.HasChanges) if (!selection.HasChanges)
return; return;
@ -1487,7 +1487,7 @@ namespace SourceGit.Views
if (change == null) if (change == null)
return; return;
var selection = MakeSelection(diff, chunk.StartIdx + 1, chunk.EndIdx + 1, false); var selection = MakeSelection(diff, chunk.StartIdx + 1, chunk.EndIdx + 1, true, false);
if (!selection.HasChanges) if (!selection.HasChanges)
return; return;
@ -1543,7 +1543,7 @@ namespace SourceGit.Views
if (change == null) if (change == null)
return; return;
var selection = MakeSelection(diff, chunk.StartIdx + 1, chunk.EndIdx + 1, false); var selection = MakeSelection(diff, chunk.StartIdx + 1, chunk.EndIdx + 1, true, false);
if (!selection.HasChanges) if (!selection.HasChanges)
return; return;
@ -1632,7 +1632,7 @@ namespace SourceGit.Views
return (startLine, endLine); return (startLine, endLine);
} }
private Models.TextDiffSelection MakeSelection(Models.TextDiff diff, int startLine, int endLine, bool isOldSide) private Models.TextDiffSelection MakeSelection(Models.TextDiff diff, int startLine, int endLine, bool combined, bool isOldSide)
{ {
var rs = new Models.TextDiffSelection(); var rs = new Models.TextDiffSelection();
rs.StartLine = startLine; rs.StartLine = startLine;
@ -1658,7 +1658,7 @@ namespace SourceGit.Views
var line = diff.Lines[i]; var line = diff.Lines[i];
if (line.Type == Models.TextDiffLineType.Added) if (line.Type == Models.TextDiffLineType.Added)
{ {
if (!UseSideBySideDiff) if (combined)
{ {
rs.HasChanges = true; rs.HasChanges = true;
break; break;
@ -1674,7 +1674,7 @@ namespace SourceGit.Views
} }
else if (line.Type == Models.TextDiffLineType.Deleted) else if (line.Type == Models.TextDiffLineType.Deleted)
{ {
if (!UseSideBySideDiff) if (combined)
{ {
rs.HasChanges = true; rs.HasChanges = true;
break; break;