Skip to content

fix: scroll to the first change using the real text layout in diff view #2700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
weiningwei wants to merge 1 commit into from
+34 −10
Closed

fix: scroll to the first change using the real text layout in diff view #2700

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 34 additions & 10 deletions src/Views/TextDiffView.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
protected override void OnDataContextChanged(EventArgs e)
{
base.OnDataContextChanged(e);
AutoScrollToFirstChange();
_execSizeChanged = false;
}

protected override void OnSizeChanged(SizeChangedEventArgs e)
Expand Down Expand Up @@ -857,20 +857,40 @@ private void AutoScrollToFirstChange()
if (curBlock == null)
return;

var lineHeight = TextArea.TextView.DefaultLineHeight;
var vOffset = lineHeight * (curBlock.Start - 1) - Bounds.Height * 0.5;
ApplyTemplate();
var scroller = this.FindDescendantOfType<ScrollViewer>();
if (scroller == null)
{
_execSizeChanged = false;
return;
}

var target = Math.Min(curBlock.Start, Document.LineCount);
if (target < 1)
return;

var textView = TextArea.TextView;
for (var i = 1; i < target; i++)
textView.GetOrConstructVisualLine(Document.GetLineByNumber(i));

var visualLine = textView.GetOrConstructVisualLine(Document.GetLineByNumber(target));
var vOffset = visualLine.VisualTop - scroller.Viewport.Height * 0.5;
if (vOffset >= 0)
{
var scroller = this.FindDescendantOfType<ScrollViewer>();
if (scroller != null)
{
var scrollOffset = new Vector(0, vOffset);
scroller.Offset = scrollOffset;
ctx.ScrollOffset = scrollOffset;
}
var scrollOffset = new Vector(0, vOffset);
scroller.Offset = scrollOffset;
ctx.ScrollOffset = scrollOffset;
}
}

protected void ScheduleAutoScrollToFirstChange()
{
if (DataContext is not ViewModels.TextDiffContext)
return;

Dispatcher.UIThread.Post(AutoScrollToFirstChange, DispatcherPriority.Background);
}

private bool CanCopyText()
{
var selection = TextArea.Selection;
Expand Down Expand Up @@ -1061,6 +1081,8 @@ protected override void OnDataContextChanged(EventArgs e)
Text = string.Empty;
}

ScheduleAutoScrollToFirstChange();

GC.Collect();
}

Expand Down Expand Up @@ -1252,6 +1274,8 @@ protected override void OnDataContextChanged(EventArgs e)
{
Text = string.Empty;
}

ScheduleAutoScrollToFirstChange();
}

protected override void UpdateSelectedChunk(double y)
Expand Down