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

enhance: render highlight background manually instead of using TextRunProperties.SetBackgroundBrush(IBrush) (#364)

Browse source
This commit is contained in:
leo 2024-08-16 18:59:48 +08:00
parent 9f39a9b295
commit ed7465def5
No known key found for this signature in database
2 changed files with 46 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Models/DiffResult.cs
View file

@ -19,8 +19,8 @@ namespace SourceGit.Models
public class TextInlineRange public class TextInlineRange
{ {
public int Start { get; set; } public int Start { get; set; }
public int Count { get; set; } public int End { get; set; }
public TextInlineRange(int p, int n) { Start = p; Count = n; } public TextInlineRange(int p, int n) { Start = p; End = p + n - 1; }
} }
public class TextDiffLine public class TextDiffLine

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

@ -175,6 +175,50 @@ namespace SourceGit.Views
var startY = line.GetTextLineVisualYPosition(line.TextLines[0], VisualYPosition.LineTop) - textView.VerticalOffset; var startY = line.GetTextLineVisualYPosition(line.TextLines[0], VisualYPosition.LineTop) - textView.VerticalOffset;
var endY = line.GetTextLineVisualYPosition(line.TextLines[^1], VisualYPosition.LineBottom) - textView.VerticalOffset; var endY = line.GetTextLineVisualYPosition(line.TextLines[^1], VisualYPosition.LineBottom) - textView.VerticalOffset;
drawingContext.DrawRectangle(bg, null, new Rect(0, startY, width, endY - startY)); drawingContext.DrawRectangle(bg, null, new Rect(0, startY, width, endY - startY));
if (info.Highlights.Count > 0)
{
var highlightBG = info.Type == Models.TextDiffLineType.Added ? _presenter.AddedHighlightBrush : _presenter.DeletedHighlightBrush;
var processingIdxStart = 0;
var processingIdxEnd = 0;
var nextHightlight = 0;
var cloned = new List<Models.TextInlineRange>();
cloned.AddRange(info.Highlights);
foreach (var tl in line.TextLines)
{
processingIdxEnd += tl.Length;
var y = line.GetTextLineVisualYPosition(tl, VisualYPosition.LineTop) - textView.VerticalOffset;
var height = line.GetTextLineVisualYPosition(tl, VisualYPosition.LineBottom) - textView.VerticalOffset - y;
while (nextHightlight < cloned.Count)
{
var highlight = cloned[nextHightlight];
if (highlight.Start >= processingIdxEnd)
{
processingIdxStart = processingIdxEnd;
break;
}
var start = highlight.Start < processingIdxStart ? processingIdxStart : highlight.Start;
var end = highlight.End >= processingIdxEnd ? processingIdxEnd : highlight.End + 1;
var x = line.GetTextLineVisualXPosition(tl, start) - textView.HorizontalOffset;
var w = line.GetTextLineVisualXPosition(tl, end) - textView.HorizontalOffset - x;
var rect = new Rect(x, y, w, height);
drawingContext.DrawRectangle(highlightBG, null, rect);
if (highlight.End >= processingIdxEnd)
break;
nextHightlight++;
}
processingIdxStart = processingIdxEnd;
}
}
} }
} }
@ -221,18 +265,6 @@ namespace SourceGit.Views
return; return;
} }
if (info.Highlights.Count > 0)
{
var bg = info.Type == Models.TextDiffLineType.Added ? _presenter.AddedHighlightBrush : _presenter.DeletedHighlightBrush;
foreach (var highlight in info.Highlights)
{
ChangeLinePart(line.Offset + highlight.Start, line.Offset + highlight.Start + highlight.Count, v =>
{
v.TextRunProperties.SetBackgroundBrush(bg);
});
}
}
} }
private readonly ThemedTextDiffPresenter _presenter; private readonly ThemedTextDiffPresenter _presenter;