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

refactor: render +/- marks after line number

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2024-10-23 15:19:59 +08:00
parent 5707d0b79a
commit d4302b4faa
No known key found for this signature in database
1 changed files with 91 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -72,6 +72,8 @@ namespace SourceGit.Views
{ {
_usePresenter = usePresenter; _usePresenter = usePresenter;
_isOld = isOld; _isOld = isOld;
Margin = new Thickness(8, 0);
ClipToBounds = true; ClipToBounds = true;
} }
@ -105,32 +107,6 @@ namespace SourceGit.Views
continue; continue;
var y = line.GetTextLineVisualYPosition(line.TextLines[0], VisualYPosition.LineMiddle) - view.VerticalOffset; var y = line.GetTextLineVisualYPosition(line.TextLines[0], VisualYPosition.LineMiddle) - view.VerticalOffset;
var prefix = null as FormattedText;
if (info.Type == Models.TextDiffLineType.Added)
{
prefix = new FormattedText(
"+",
CultureInfo.CurrentCulture,
FlowDirection.LeftToRight,
typeface,
presenter.FontSize,
Brushes.Green);
}
else if (info.Type == Models.TextDiffLineType.Deleted)
{
prefix = new FormattedText(
"-",
CultureInfo.CurrentCulture,
FlowDirection.LeftToRight,
typeface,
presenter.FontSize,
Brushes.Red);
}
if (prefix != null)
context.DrawText(prefix, new Point(0, y - prefix.Height * 0.5));
var txt = new FormattedText( var txt = new FormattedText(
lineNumber, lineNumber,
CultureInfo.CurrentCulture, CultureInfo.CurrentCulture,
@ -152,7 +128,7 @@ namespace SourceGit.Views
var maxLineNumber = presenter.GetMaxLineNumber(); var maxLineNumber = presenter.GetMaxLineNumber();
var typeface = TextView.CreateTypeface(); var typeface = TextView.CreateTypeface();
var test = new FormattedText( var test = new FormattedText(
$"- {maxLineNumber}", $"{maxLineNumber}",
CultureInfo.CurrentCulture, CultureInfo.CurrentCulture,
FlowDirection.LeftToRight, FlowDirection.LeftToRight,
typeface, typeface,
@ -171,6 +147,89 @@ namespace SourceGit.Views
private bool _isOld = false; private bool _isOld = false;
} }
public class LineModifyTypeMargin : AbstractMargin
{
public LineModifyTypeMargin()
{
Margin = new Thickness(1, 0);
ClipToBounds = true;
}
public override void Render(DrawingContext context)
{
var presenter = this.FindAncestorOfType<ThemedTextDiffPresenter>();
if (presenter == null)
return;
var lines = presenter.GetLines();
var view = TextView;
if (view != null && view.VisualLinesValid)
{
var typeface = view.CreateTypeface();
foreach (var line in view.VisualLines)
{
if (line.IsDisposed || line.FirstDocumentLine == null || line.FirstDocumentLine.IsDeleted)
continue;
var index = line.FirstDocumentLine.LineNumber;
if (index > lines.Count)
break;
var info = lines[index - 1];
var y = line.GetTextLineVisualYPosition(line.TextLines[0], VisualYPosition.LineMiddle) - view.VerticalOffset;
var indicator = null as FormattedText;
if (info.Type == Models.TextDiffLineType.Added)
{
indicator = new FormattedText(
"+",
CultureInfo.CurrentCulture,
FlowDirection.LeftToRight,
typeface,
presenter.FontSize,
Brushes.Green);
}
else if (info.Type == Models.TextDiffLineType.Deleted)
{
indicator = new FormattedText(
"-",
CultureInfo.CurrentCulture,
FlowDirection.LeftToRight,
typeface,
presenter.FontSize,
Brushes.Red);
}
if (indicator != null)
context.DrawText(indicator, new Point(0, y - indicator.Height * 0.5));
}
}
}
protected override Size MeasureOverride(Size availableSize)
{
var presenter = this.FindAncestorOfType<ThemedTextDiffPresenter>();
if (presenter == null)
return new Size(0, 0);
var maxLineNumber = presenter.GetMaxLineNumber();
var typeface = TextView.CreateTypeface();
var test = new FormattedText(
$"-",
CultureInfo.CurrentCulture,
FlowDirection.LeftToRight,
typeface,
presenter.FontSize,
Brushes.White);
return new Size(test.Width, 0);
}
protected override void OnDataContextChanged(EventArgs e)
{
base.OnDataContextChanged(e);
InvalidateMeasure();
}
}
public class LineBackgroundRenderer : IBackgroundRenderer public class LineBackgroundRenderer : IBackgroundRenderer
{ {
public KnownLayer Layer => KnownLayer.Background; public KnownLayer Layer => KnownLayer.Background;
@ -700,10 +759,11 @@ namespace SourceGit.Views
{ {
public CombinedTextDiffPresenter() : base(new TextArea(), new TextDocument()) public CombinedTextDiffPresenter() : base(new TextArea(), new TextDocument())
{ {
TextArea.LeftMargins.Add(new LineNumberMargin(false, true) { Margin = new Thickness(8, 0) }); TextArea.LeftMargins.Add(new LineNumberMargin(false, true));
TextArea.LeftMargins.Add(new VerticalSeperatorMargin()); TextArea.LeftMargins.Add(new VerticalSeperatorMargin());
TextArea.LeftMargins.Add(new LineNumberMargin(false, false) { Margin = new Thickness(8, 0) }); TextArea.LeftMargins.Add(new LineNumberMargin(false, false));
TextArea.LeftMargins.Add(new VerticalSeperatorMargin()); TextArea.LeftMargins.Add(new VerticalSeperatorMargin());
TextArea.LeftMargins.Add(new LineModifyTypeMargin());
} }
public override List<Models.TextDiffLine> GetLines() public override List<Models.TextDiffLine> GetLines()
@ -904,8 +964,9 @@ namespace SourceGit.Views
{ {
public SingleSideTextDiffPresenter() : base(new TextArea(), new TextDocument()) public SingleSideTextDiffPresenter() : base(new TextArea(), new TextDocument())
{ {
TextArea.LeftMargins.Add(new LineNumberMargin(true, false) { Margin = new Thickness(8, 0) }); TextArea.LeftMargins.Add(new LineNumberMargin(true, false));
TextArea.LeftMargins.Add(new VerticalSeperatorMargin()); TextArea.LeftMargins.Add(new VerticalSeperatorMargin());
TextArea.LeftMargins.Add(new LineModifyTypeMargin());
} }
public override List<Models.TextDiffLine> GetLines() public override List<Models.TextDiffLine> GetLines()