github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-21 13:20:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

enhance: do nothing if current line is not in a conflict region

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2026-01-30 11:13:32 +08:00
parent 7f757e11d5
commit 4f11be1148
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Views/MergeConflictEditor.axaml.cs
View File

@@ -161,12 +161,14 @@ namespace SourceGit.Views
var lineIndex = index - 1;
var info = lines[lineIndex];
var lineState = vm.GetLineState(lineIndex);
if (info.Type == Models.ConflictLineType.Common)
continue;
var startY = line.GetTextLineVisualYPosition(line.TextLines[0], VisualYPosition.LineTop) - textView.VerticalOffset;
var endY = line.GetTextLineVisualYPosition(line.TextLines[^1], VisualYPosition.LineBottom) - textView.VerticalOffset;
var rect = new Rect(0, startY, width, endY - startY);
var lineState = vm.GetLineState(lineIndex);
if (lineState == Models.ConflictLineState.ConflictBlockStart)
drawingContext.DrawLine(new Pen(new SolidColorBrush(Colors.Red, 0.6)), new Point(0, startY + 0.5), new Point(width, startY + 0.5));
else if (lineState == Models.ConflictLineState.ConflictBlockEnd)