mirror of
https://github.com/sourcegit-scm/sourcegit.git
synced 2024-12-24 20:57:19 -08:00
feature: add change minimap for text diff view
Some checks failed
Some checks failed
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
parent
b7abf2ee50
commit
3b09ea45f5
3 changed files with 216 additions and 66 deletions
|
@ -38,7 +38,7 @@ namespace SourceGit.Views
|
||||||
}
|
}
|
||||||
|
|
||||||
public static readonly StyledProperty<IBrush> BackgroundProperty =
|
public static readonly StyledProperty<IBrush> BackgroundProperty =
|
||||||
AvaloniaProperty.Register<CommitRefsPresenter, IBrush>(nameof(Background), null);
|
AvaloniaProperty.Register<CommitRefsPresenter, IBrush>(nameof(Background), Brushes.Transparent);
|
||||||
|
|
||||||
public IBrush Background
|
public IBrush Background
|
||||||
{
|
{
|
||||||
|
@ -56,7 +56,7 @@ namespace SourceGit.Views
|
||||||
}
|
}
|
||||||
|
|
||||||
public static readonly StyledProperty<bool> UseGraphColorProperty =
|
public static readonly StyledProperty<bool> UseGraphColorProperty =
|
||||||
AvaloniaProperty.Register<CommitRefsPresenter, bool>(nameof(UseGraphColor), false);
|
AvaloniaProperty.Register<CommitRefsPresenter, bool>(nameof(UseGraphColor));
|
||||||
|
|
||||||
public bool UseGraphColor
|
public bool UseGraphColor
|
||||||
{
|
{
|
||||||
|
@ -96,7 +96,6 @@ namespace SourceGit.Views
|
||||||
var x = 1.0;
|
var x = 1.0;
|
||||||
foreach (var item in _items)
|
foreach (var item in _items)
|
||||||
{
|
{
|
||||||
var iconRect = new RoundedRect(new Rect(x, 0, 16, 16), new CornerRadius(2, 0, 0, 2));
|
|
||||||
var entireRect = new RoundedRect(new Rect(x, 0, item.Width, 16), new CornerRadius(2));
|
var entireRect = new RoundedRect(new Rect(x, 0, item.Width, 16), new CornerRadius(2));
|
||||||
|
|
||||||
if (item.IsHead)
|
if (item.IsHead)
|
||||||
|
|
|
@ -13,27 +13,39 @@
|
||||||
<ContentControl x:Name="Editor">
|
<ContentControl x:Name="Editor">
|
||||||
<ContentControl.DataTemplates>
|
<ContentControl.DataTemplates>
|
||||||
<DataTemplate DataType="m:TextDiff">
|
<DataTemplate DataType="m:TextDiff">
|
||||||
<v:CombinedTextDiffPresenter FileName="{Binding File}"
|
<Grid ColumnDefinitions="*,1,8">
|
||||||
Foreground="{DynamicResource Brush.FG1}"
|
<v:CombinedTextDiffPresenter Grid.Column="0"
|
||||||
LineBrush="{DynamicResource Brush.Border2}"
|
x:Name="CombinedPresenter"
|
||||||
EmptyContentBackground="{DynamicResource Brush.Diff.EmptyBG}"
|
FileName="{Binding File}"
|
||||||
AddedContentBackground="{DynamicResource Brush.Diff.AddedBG}"
|
Foreground="{DynamicResource Brush.FG1}"
|
||||||
DeletedContentBackground="{DynamicResource Brush.Diff.DeletedBG}"
|
LineBrush="{DynamicResource Brush.Border2}"
|
||||||
AddedHighlightBrush="{DynamicResource Brush.Diff.AddedHighlight}"
|
EmptyContentBackground="{DynamicResource Brush.Diff.EmptyBG}"
|
||||||
DeletedHighlightBrush="{DynamicResource Brush.Diff.DeletedHighlight}"
|
AddedContentBackground="{DynamicResource Brush.Diff.AddedBG}"
|
||||||
IndicatorForeground="{DynamicResource Brush.FG2}"
|
DeletedContentBackground="{DynamicResource Brush.Diff.DeletedBG}"
|
||||||
FontFamily="{DynamicResource Fonts.Monospace}"
|
AddedHighlightBrush="{DynamicResource Brush.Diff.AddedHighlight}"
|
||||||
FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=EditorFontSize}"
|
DeletedHighlightBrush="{DynamicResource Brush.Diff.DeletedHighlight}"
|
||||||
UseSyntaxHighlighting="{Binding Source={x:Static vm:Preference.Instance}, Path=UseSyntaxHighlighting}"
|
IndicatorForeground="{DynamicResource Brush.FG2}"
|
||||||
WordWrap="{Binding Source={x:Static vm:Preference.Instance}, Path=EnableDiffViewWordWrap}"
|
FontFamily="{DynamicResource Fonts.Monospace}"
|
||||||
ShowHiddenSymbols="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowHiddenSymbolsInDiffView}"
|
FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=EditorFontSize}"
|
||||||
EnableChunkSelection="{Binding #ThisControl.EnableChunkSelection}"
|
UseSyntaxHighlighting="{Binding Source={x:Static vm:Preference.Instance}, Path=UseSyntaxHighlighting}"
|
||||||
SelectedChunk="{Binding #ThisControl.SelectedChunk, Mode=TwoWay}"/>
|
WordWrap="{Binding Source={x:Static vm:Preference.Instance}, Path=EnableDiffViewWordWrap}"
|
||||||
|
ShowHiddenSymbols="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowHiddenSymbolsInDiffView}"
|
||||||
|
EnableChunkSelection="{Binding #ThisControl.EnableChunkSelection}"
|
||||||
|
SelectedChunk="{Binding #ThisControl.SelectedChunk, Mode=TwoWay}"/>
|
||||||
|
|
||||||
|
<Rectangle Grid.Column="1" Fill="{DynamicResource Brush.Border2}" Width="1" HorizontalAlignment="Center" VerticalAlignment="Stretch"/>
|
||||||
|
|
||||||
|
<v:TextDiffViewMinimap Grid.Column="2"
|
||||||
|
DisplayRange="{Binding #CombinedPresenter.DisplayRange}"
|
||||||
|
AddedLineBrush="{DynamicResource Brush.Diff.AddedBG}"
|
||||||
|
DeletedLineBrush="{DynamicResource Brush.Diff.DeletedBG}"/>
|
||||||
|
</Grid>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
|
|
||||||
<DataTemplate DataType="vm:TwoSideTextDiff">
|
<DataTemplate DataType="vm:TwoSideTextDiff">
|
||||||
<Grid ColumnDefinitions="*,1,*">
|
<Grid ColumnDefinitions="*,1,*,1,12">
|
||||||
<v:SingleSideTextDiffPresenter Grid.Column="0"
|
<v:SingleSideTextDiffPresenter Grid.Column="0"
|
||||||
|
x:Name="LeftSidePresenter"
|
||||||
IsOld="True"
|
IsOld="True"
|
||||||
FileName="{Binding File}"
|
FileName="{Binding File}"
|
||||||
Foreground="{DynamicResource Brush.FG1}"
|
Foreground="{DynamicResource Brush.FG1}"
|
||||||
|
@ -72,6 +84,13 @@
|
||||||
ShowHiddenSymbols="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowHiddenSymbolsInDiffView}"
|
ShowHiddenSymbols="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowHiddenSymbolsInDiffView}"
|
||||||
EnableChunkSelection="{Binding #ThisControl.EnableChunkSelection}"
|
EnableChunkSelection="{Binding #ThisControl.EnableChunkSelection}"
|
||||||
SelectedChunk="{Binding #ThisControl.SelectedChunk, Mode=TwoWay}"/>
|
SelectedChunk="{Binding #ThisControl.SelectedChunk, Mode=TwoWay}"/>
|
||||||
|
|
||||||
|
<Rectangle Grid.Column="3" Fill="{DynamicResource Brush.Border2}" Width="1" HorizontalAlignment="Center" VerticalAlignment="Stretch"/>
|
||||||
|
|
||||||
|
<v:TextDiffViewMinimap Grid.Column="4"
|
||||||
|
DisplayRange="{Binding #LeftSidePresenter.DisplayRange}"
|
||||||
|
AddedLineBrush="{DynamicResource Brush.Diff.AddedBG}"
|
||||||
|
DeletedLineBrush="{DynamicResource Brush.Diff.DeletedBG}"/>
|
||||||
</Grid>
|
</Grid>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</ContentControl.DataTemplates>
|
</ContentControl.DataTemplates>
|
||||||
|
|
|
@ -45,6 +45,18 @@ namespace SourceGit.Views
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public record TextDiffViewRange
|
||||||
|
{
|
||||||
|
public int StartIdx { get; set; } = 0;
|
||||||
|
public int EndIdx { get; set; } = 0;
|
||||||
|
|
||||||
|
public TextDiffViewRange(int startIdx, int endIdx)
|
||||||
|
{
|
||||||
|
StartIdx = startIdx;
|
||||||
|
EndIdx = endIdx;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public class ThemedTextDiffPresenter : TextEditor
|
public class ThemedTextDiffPresenter : TextEditor
|
||||||
{
|
{
|
||||||
public class VerticalSeperatorMargin : AbstractMargin
|
public class VerticalSeperatorMargin : AbstractMargin
|
||||||
|
@ -210,7 +222,6 @@ namespace SourceGit.Views
|
||||||
if (presenter == null)
|
if (presenter == null)
|
||||||
return new Size(0, 0);
|
return new Size(0, 0);
|
||||||
|
|
||||||
var maxLineNumber = presenter.GetMaxLineNumber();
|
|
||||||
var typeface = TextView.CreateTypeface();
|
var typeface = TextView.CreateTypeface();
|
||||||
var test = new FormattedText(
|
var test = new FormattedText(
|
||||||
$"-",
|
$"-",
|
||||||
|
@ -465,6 +476,15 @@ namespace SourceGit.Views
|
||||||
get => GetValue(SelectedChunkProperty);
|
get => GetValue(SelectedChunkProperty);
|
||||||
set => SetValue(SelectedChunkProperty, value);
|
set => SetValue(SelectedChunkProperty, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static readonly StyledProperty<TextDiffViewRange> DisplayRangeProperty =
|
||||||
|
AvaloniaProperty.Register<ThemedTextDiffPresenter, TextDiffViewRange>(nameof(DisplayRange), new TextDiffViewRange(0, 0));
|
||||||
|
|
||||||
|
public TextDiffViewRange DisplayRange
|
||||||
|
{
|
||||||
|
get => GetValue(DisplayRangeProperty);
|
||||||
|
set => SetValue(DisplayRangeProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
protected override Type StyleKeyOverride => typeof(TextEditor);
|
protected override Type StyleKeyOverride => typeof(TextEditor);
|
||||||
|
|
||||||
|
@ -500,25 +520,11 @@ namespace SourceGit.Views
|
||||||
|
|
||||||
public void GotoPrevChange()
|
public void GotoPrevChange()
|
||||||
{
|
{
|
||||||
var view = TextArea.TextView;
|
var firstLineIdx = DisplayRange.StartIdx;
|
||||||
var lines = GetLines();
|
|
||||||
var firstLineIdx = lines.Count;
|
|
||||||
foreach (var line in view.VisualLines)
|
|
||||||
{
|
|
||||||
if (line.IsDisposed || line.FirstDocumentLine == null || line.FirstDocumentLine.IsDeleted)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
var index = line.FirstDocumentLine.LineNumber - 1;
|
|
||||||
if (index >= lines.Count)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (firstLineIdx > index)
|
|
||||||
firstLineIdx = index;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (firstLineIdx <= 1)
|
if (firstLineIdx <= 1)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
var lines = GetLines();
|
||||||
var firstLineType = lines[firstLineIdx].Type;
|
var firstLineType = lines[firstLineIdx].Type;
|
||||||
var prevLineType = lines[firstLineIdx - 1].Type;
|
var prevLineType = lines[firstLineIdx - 1].Type;
|
||||||
var isChangeFirstLine = firstLineType != Models.TextDiffLineType.Normal && firstLineType != Models.TextDiffLineType.Indicator;
|
var isChangeFirstLine = firstLineType != Models.TextDiffLineType.Normal && firstLineType != Models.TextDiffLineType.Indicator;
|
||||||
|
@ -557,22 +563,8 @@ namespace SourceGit.Views
|
||||||
|
|
||||||
public void GotoNextChange()
|
public void GotoNextChange()
|
||||||
{
|
{
|
||||||
var view = TextArea.TextView;
|
|
||||||
var lines = GetLines();
|
var lines = GetLines();
|
||||||
var lastLineIdx = -1;
|
var lastLineIdx = DisplayRange.EndIdx;
|
||||||
foreach (var line in view.VisualLines)
|
|
||||||
{
|
|
||||||
if (line.IsDisposed || line.FirstDocumentLine == null || line.FirstDocumentLine.IsDeleted)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
var index = line.FirstDocumentLine.LineNumber - 1;
|
|
||||||
if (index >= lines.Count)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (lastLineIdx < index)
|
|
||||||
lastLineIdx = index;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (lastLineIdx >= lines.Count - 1)
|
if (lastLineIdx >= lines.Count - 1)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -624,6 +616,7 @@ namespace SourceGit.Views
|
||||||
TextArea.TextView.PointerEntered += OnTextViewPointerChanged;
|
TextArea.TextView.PointerEntered += OnTextViewPointerChanged;
|
||||||
TextArea.TextView.PointerMoved += OnTextViewPointerChanged;
|
TextArea.TextView.PointerMoved += OnTextViewPointerChanged;
|
||||||
TextArea.TextView.PointerWheelChanged += OnTextViewPointerWheelChanged;
|
TextArea.TextView.PointerWheelChanged += OnTextViewPointerWheelChanged;
|
||||||
|
TextArea.TextView.VisualLinesChanged += OnTextViewVisualLinesChanged;
|
||||||
|
|
||||||
UpdateTextMate();
|
UpdateTextMate();
|
||||||
}
|
}
|
||||||
|
@ -636,6 +629,7 @@ namespace SourceGit.Views
|
||||||
TextArea.TextView.PointerEntered -= OnTextViewPointerChanged;
|
TextArea.TextView.PointerEntered -= OnTextViewPointerChanged;
|
||||||
TextArea.TextView.PointerMoved -= OnTextViewPointerChanged;
|
TextArea.TextView.PointerMoved -= OnTextViewPointerChanged;
|
||||||
TextArea.TextView.PointerWheelChanged -= OnTextViewPointerWheelChanged;
|
TextArea.TextView.PointerWheelChanged -= OnTextViewPointerWheelChanged;
|
||||||
|
TextArea.TextView.VisualLinesChanged -= OnTextViewVisualLinesChanged;
|
||||||
|
|
||||||
if (_textMate != null)
|
if (_textMate != null)
|
||||||
{
|
{
|
||||||
|
@ -743,6 +737,34 @@ namespace SourceGit.Views
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void OnTextViewVisualLinesChanged(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (!TextArea.TextView.VisualLinesValid)
|
||||||
|
{
|
||||||
|
SetCurrentValue(DisplayRangeProperty, new TextDiffViewRange(0, 0));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var lines = GetLines();
|
||||||
|
var start = int.MaxValue;
|
||||||
|
var count = 0;
|
||||||
|
foreach (var line in TextArea.TextView.VisualLines)
|
||||||
|
{
|
||||||
|
if (line.IsDisposed || line.FirstDocumentLine == null || line.FirstDocumentLine.IsDeleted)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
var index = line.FirstDocumentLine.LineNumber - 1;
|
||||||
|
if (index >= lines.Count)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
count++;
|
||||||
|
if (start > index)
|
||||||
|
start = index;
|
||||||
|
}
|
||||||
|
|
||||||
|
SetCurrentValue(DisplayRangeProperty, new TextDiffViewRange(start, start + count));
|
||||||
|
}
|
||||||
|
|
||||||
protected void TrySetChunk(TextDiffViewChunk chunk)
|
protected void TrySetChunk(TextDiffViewChunk chunk)
|
||||||
{
|
{
|
||||||
var old = SelectedChunk;
|
var old = SelectedChunk;
|
||||||
|
@ -1050,12 +1072,8 @@ namespace SourceGit.Views
|
||||||
|
|
||||||
private void OnTextViewScrollGotFocus(object sender, GotFocusEventArgs e)
|
private void OnTextViewScrollGotFocus(object sender, GotFocusEventArgs e)
|
||||||
{
|
{
|
||||||
if (EnableChunkSelection && sender is ScrollViewer viewer)
|
if (EnableChunkSelection && !TextArea.IsPointerOver)
|
||||||
{
|
TrySetChunk(null);
|
||||||
var area = viewer.FindDescendantOfType<TextArea>();
|
|
||||||
if (!area.IsPointerOver)
|
|
||||||
TrySetChunk(null);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1277,12 +1295,8 @@ namespace SourceGit.Views
|
||||||
|
|
||||||
private void OnTextViewScrollGotFocus(object sender, GotFocusEventArgs e)
|
private void OnTextViewScrollGotFocus(object sender, GotFocusEventArgs e)
|
||||||
{
|
{
|
||||||
if (EnableChunkSelection && sender is ScrollViewer viewer)
|
if (EnableChunkSelection && !TextArea.IsPointerOver)
|
||||||
{
|
TrySetChunk(null);
|
||||||
var area = viewer.FindDescendantOfType<TextArea>();
|
|
||||||
if (!area.IsPointerOver)
|
|
||||||
TrySetChunk(null);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnTextViewScrollChanged(object sender, ScrollChangedEventArgs e)
|
private void OnTextViewScrollChanged(object sender, ScrollChangedEventArgs e)
|
||||||
|
@ -1299,7 +1313,125 @@ namespace SourceGit.Views
|
||||||
|
|
||||||
private ScrollViewer _scrollViewer = null;
|
private ScrollViewer _scrollViewer = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class TextDiffViewMinimap : Control
|
||||||
|
{
|
||||||
|
public static readonly StyledProperty<IBrush> AddedLineBrushProperty =
|
||||||
|
AvaloniaProperty.Register<TextDiffViewMinimap, IBrush>(nameof(AddedLineBrush), new SolidColorBrush(Color.FromArgb(60, 0, 255, 0)));
|
||||||
|
|
||||||
|
public IBrush AddedLineBrush
|
||||||
|
{
|
||||||
|
get => GetValue(AddedLineBrushProperty);
|
||||||
|
set => SetValue(AddedLineBrushProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static readonly StyledProperty<IBrush> DeletedLineBrushProperty =
|
||||||
|
AvaloniaProperty.Register<TextDiffViewMinimap, IBrush>(nameof(DeletedLineBrush), new SolidColorBrush(Color.FromArgb(60, 255, 0, 0)));
|
||||||
|
|
||||||
|
public IBrush DeletedLineBrush
|
||||||
|
{
|
||||||
|
get => GetValue(DeletedLineBrushProperty);
|
||||||
|
set => SetValue(DeletedLineBrushProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static readonly StyledProperty<TextDiffViewRange> DisplayRangeProperty =
|
||||||
|
AvaloniaProperty.Register<TextDiffViewMinimap, TextDiffViewRange>(nameof(DisplayRange), new TextDiffViewRange(0, 0));
|
||||||
|
|
||||||
|
public TextDiffViewRange DisplayRange
|
||||||
|
{
|
||||||
|
get => GetValue(DisplayRangeProperty);
|
||||||
|
set => SetValue(DisplayRangeProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static readonly StyledProperty<Color> DisplayRangeColorProperty =
|
||||||
|
AvaloniaProperty.Register<TextDiffViewMinimap, Color>(nameof(DisplayRangeColor), Colors.RoyalBlue);
|
||||||
|
|
||||||
|
public Color DisplayRangeColor
|
||||||
|
{
|
||||||
|
get => GetValue(DisplayRangeColorProperty);
|
||||||
|
set => SetValue(DisplayRangeColorProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
static TextDiffViewMinimap()
|
||||||
|
{
|
||||||
|
AffectsRender<TextDiffViewMinimap>(
|
||||||
|
AddedLineBrushProperty,
|
||||||
|
DeletedLineBrushProperty,
|
||||||
|
DisplayRangeProperty,
|
||||||
|
DisplayRangeColorProperty);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Render(DrawingContext context)
|
||||||
|
{
|
||||||
|
var total = 0;
|
||||||
|
if (DataContext is ViewModels.TwoSideTextDiff twoSideDiff)
|
||||||
|
{
|
||||||
|
var halfWidth = Bounds.Width * 0.5;
|
||||||
|
total = Math.Max(twoSideDiff.Old.Count, twoSideDiff.New.Count);
|
||||||
|
RenderSingleSide(context, twoSideDiff.Old, 0, halfWidth);
|
||||||
|
RenderSingleSide(context, twoSideDiff.New, halfWidth, halfWidth);
|
||||||
|
}
|
||||||
|
else if (DataContext is Models.TextDiff diff)
|
||||||
|
{
|
||||||
|
total = diff.Lines.Count;
|
||||||
|
RenderSingleSide(context, diff.Lines, 0, Bounds.Width);
|
||||||
|
}
|
||||||
|
|
||||||
|
var range = DisplayRange;
|
||||||
|
if (range.EndIdx == 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var startY = range.StartIdx / (total * 1.0) * Bounds.Height;
|
||||||
|
var endY = range.EndIdx / (total * 1.0) * Bounds.Height;
|
||||||
|
var color = DisplayRangeColor;
|
||||||
|
var brush = new SolidColorBrush(color, 0.2);
|
||||||
|
var pen = new Pen(color.ToUInt32());
|
||||||
|
var rect = new Rect(0, startY, Bounds.Width, endY - startY);
|
||||||
|
|
||||||
|
context.DrawRectangle(brush, null, rect);
|
||||||
|
context.DrawLine(pen, rect.TopLeft, rect.TopRight);
|
||||||
|
context.DrawLine(pen, rect.BottomLeft, rect.BottomRight);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void OnDataContextChanged(EventArgs e)
|
||||||
|
{
|
||||||
|
base.OnDataContextChanged(e);
|
||||||
|
InvalidateVisual();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void RenderSingleSide(DrawingContext context, List<Models.TextDiffLine> lines, double x, double width)
|
||||||
|
{
|
||||||
|
var total = lines.Count;
|
||||||
|
var lastLineType = Models.TextDiffLineType.Indicator;
|
||||||
|
var lastLineTypeStart = 0;
|
||||||
|
|
||||||
|
for (int i = 0; i < total; i++)
|
||||||
|
{
|
||||||
|
var line = lines[i];
|
||||||
|
if (line.Type != lastLineType)
|
||||||
|
{
|
||||||
|
RenderBlock(context, lastLineType, lastLineTypeStart, i - lastLineTypeStart, total, x, width);
|
||||||
|
|
||||||
|
lastLineType = line.Type;
|
||||||
|
lastLineTypeStart = i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
RenderBlock(context, lastLineType, lastLineTypeStart, total - lastLineTypeStart, total, x, width);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void RenderBlock(DrawingContext context, Models.TextDiffLineType type, int start, int count, int total, double x, double width)
|
||||||
|
{
|
||||||
|
if (type == Models.TextDiffLineType.Added || type == Models.TextDiffLineType.Deleted)
|
||||||
|
{
|
||||||
|
var brush = type == Models.TextDiffLineType.Added ? AddedLineBrush : DeletedLineBrush;
|
||||||
|
var y = start / (total * 1.0) * Bounds.Height;
|
||||||
|
var h = count / (total * 1.0) * Bounds.Height;
|
||||||
|
context.DrawRectangle(brush, null, new Rect(x, y, width, h));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public partial class TextDiffView : UserControl
|
public partial class TextDiffView : UserControl
|
||||||
{
|
{
|
||||||
public static readonly StyledProperty<bool> UseSideBySideDiffProperty =
|
public static readonly StyledProperty<bool> UseSideBySideDiffProperty =
|
||||||
|
@ -1383,7 +1515,7 @@ namespace SourceGit.Views
|
||||||
protected override void OnDataContextChanged(EventArgs e)
|
protected override void OnDataContextChanged(EventArgs e)
|
||||||
{
|
{
|
||||||
base.OnDataContextChanged(e);
|
base.OnDataContextChanged(e);
|
||||||
RefreshContent(DataContext as Models.TextDiff, true);
|
RefreshContent(DataContext as Models.TextDiff);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnPointerExited(PointerEventArgs e)
|
protected override void OnPointerExited(PointerEventArgs e)
|
||||||
|
|
Loading…
Reference in a new issue